Changeset 8d6c1f1 in mainline for kernel/generic/src/ipc/irq.c

Timestamp:

2011-06-07T21:31:35Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

75608143

Parents:

ff4f073 (diff), eb522e8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge USB support.

Changes from bzr://helenos-usb.bzr.sourceforge.net/bzrroot/helenos-usb/mainline:

• replaced '-' with '_' in new driver names
• USB libs are built for each architecture
• devman starts early
• sys_thread_udelay() uses generic delay()
• sys_as_create_area() now creates cacheable areas by default

File:

• kernel/generic/src/ipc/irq.c (modified) (4 diffs)

kernel/generic/src/ipc/irq.c

@@ -174 +174 @@
         irq->notif_cfg.code = code;
         irq->notif_cfg.counter = 0;
+        irq->driver_as = AS;
         
         /*
@@ -364 +365 @@
                 return IRQ_DECLINE;
         
+#define CMD_MEM_READ(target) \
+do { \
+        void *va = code->cmds[i].addr; \
+        if (AS != irq->driver_as) \
+                as_switch(AS, irq->driver_as); \
+        memcpy_from_uspace(&target, va, (sizeof(target))); \
+        if (dstarg) \
+                scratch[dstarg] = target; \
+} while(0)
+
+#define CMD_MEM_WRITE(val) \
+do { \
+        void *va = code->cmds[i].addr; \
+        if (AS != irq->driver_as) \
+                as_switch(AS, irq->driver_as); \
+        memcpy_to_uspace(va, &val, sizeof(val)); \
+} while (0)
+
+        as_t *current_as = AS;
         size_t i;
         for (i = 0; i < code->cmdcount; i++) {
@@ -422 +442 @@
                         }
                         break;
+                case CMD_MEM_READ_8: {
+                        uint8_t val;
+                        CMD_MEM_READ(val);
+                        break;
+                        }
+                case CMD_MEM_READ_16: {
+                        uint16_t val;
+                        CMD_MEM_READ(val);
+                        break;
+                        }
+                case CMD_MEM_READ_32: {
+                        uint32_t val;
+                        CMD_MEM_READ(val);
+                        break;
+                        }
+                case CMD_MEM_WRITE_8: {
+                        uint8_t val = code->cmds[i].value;
+                        CMD_MEM_WRITE(val);
+                        break;
+                        }
+                case CMD_MEM_WRITE_16: {
+                        uint16_t val = code->cmds[i].value;
+                        CMD_MEM_WRITE(val);
+                        break;
+                        }
+                case CMD_MEM_WRITE_32: {
+                        uint32_t val = code->cmds[i].value;
+                        CMD_MEM_WRITE(val);
+                        break;
+                        }
+                case CMD_MEM_WRITE_A_8:
+                        if (srcarg) {
+                                uint8_t val = scratch[srcarg];
+                                CMD_MEM_WRITE(val);
+                        }
+                        break;
+                case CMD_MEM_WRITE_A_16:
+                        if (srcarg) {
+                                uint16_t val = scratch[srcarg];
+                                CMD_MEM_WRITE(val);
+                        }
+                        break;
+                case CMD_MEM_WRITE_A_32:
+                        if (srcarg) {
+                                uint32_t val = scratch[srcarg];
+                                CMD_MEM_WRITE(val);
+                        }
+                        break;
                 case CMD_BTEST:
                         if ((srcarg) && (dstarg)) {
@@ -435 +503 @@
                         break;
                 case CMD_ACCEPT:
+                        if (AS != current_as)
+                                as_switch(AS, current_as);
                         return IRQ_ACCEPT;
                 case CMD_DECLINE:
                 default:
+                        if (AS != current_as)
+                                as_switch(AS, current_as);
                         return IRQ_DECLINE;
                 }
         }
+        if (AS != current_as)
+                as_switch(AS, current_as);
         
         return IRQ_DECLINE;