Changeset 180255f in mainline

Timestamp:

2011-05-06T12:45:29Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

03cfda08

Parents:

561112f

Message:

Implement access to memory mapped register in irq pseudocode.

Location:

kernel/generic

Files:

• include/ddi/irq.h (modified) (1 diff)
• src/ipc/irq.c (modified) (4 diffs)

kernel/generic/include/ddi/irq.h

@@ -224 +224 @@
         /** Notification configuration structure. */
         ipc_notif_cfg_t notif_cfg; 
+
+        as_t *driver_as;
 } irq_t;
 

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); \
+        printf("Copying data from address: %p.\n", va); \
+        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); \
+        printf("Writing data to address: %p.\n", va); \
+        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 +444 @@
                         }
                         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);
+                        printf("mem READ value: %x.\n", 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 +506 @@
                         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;