Changeset a676574 in mainline for kernel/generic/src/ipc

Timestamp:

2011-01-09T12:18:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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.

Location:

kernel/generic/src/ipc

Files:

• ipc.c (modified) (1 diff)
• irq.c (modified) (1 diff)

kernel/generic/src/ipc/ipc.c

@@ -706 +706 @@
                                 break;
                         case IPC_PHONE_CONNECTED:
-                                printf("connected to: %p ",
-                                    task->phones[i].callee);
+                                printf("connected to: %p (%" PRIu64 ") ",
+                                    task->phones[i].callee,
+                                    task->phones[i].callee->task->taskid);
                                 break;
                         case IPC_PHONE_SLAMMED:

kernel/generic/src/ipc/irq.c

@@ -404 +404 @@
                             (uint32_t) code->cmds[i].value);
                         break;
+                case CMD_PIO_WRITE_A_8:
+                        if (srcarg) {
+                                pio_write_8((ioport8_t *) code->cmds[i].addr,
+                                    (uint8_t) scratch[srcarg]);
+                        }
+                        break;
+                case CMD_PIO_WRITE_A_16:
+                        if (srcarg) {
+                                pio_write_16((ioport16_t *) code->cmds[i].addr,
+                                    (uint16_t) scratch[srcarg]);
+                        }
+                        break;
+                case CMD_PIO_WRITE_A_32:
+                        if (srcarg) {
+                                pio_write_32((ioport32_t *) code->cmds[i].addr,
+                                    (uint32_t) scratch[srcarg]);
+                        }
+                        break;
                 case CMD_BTEST:
                         if ((srcarg) && (dstarg)) {