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

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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 mainline changes

File:

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

kernel/generic/src/ipc/irq.c

@@ -174 +174 @@
         irq->notif_cfg.code = code;
         irq->notif_cfg.counter = 0;
+        irq->driver_as = AS;
         
         /*
@@ -199 +200 @@
         
         hash_table_insert(&irq_uspace_hash_table, key, &irq->link);
-        list_append(&irq->notif_cfg.link, &box->irq_head);
+        list_append(&irq->notif_cfg.link, &box->irq_list);
         
         irq_spinlock_unlock(&box->irq_lock, false);
@@ -281 +282 @@
         irq_spinlock_lock(&box->irq_lock, false);
         
-        while (box->irq_head.next != &box->irq_head) {
+        while (!list_empty(&box->irq_list)) {
                 DEADLOCK_PROBE_INIT(p_irqlock);
                 
-                irq_t *irq = list_get_instance(box->irq_head.next, irq_t,
+                irq_t *irq = list_get_instance(list_first(&box->irq_list), irq_t,
                     notif_cfg.link);
                 
@@ -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;