Changeset 8d6c1f1 in mainline for kernel/generic/include

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

Location:

kernel/generic/include

Files:

• ddi/irq.h (modified) (2 diffs)
• mm/page.h (modified) (2 diffs)
• proc/thread.h (modified) (1 diff)
• syscall/syscall.h (modified) (2 diffs)

kernel/generic/include/ddi/irq.h

@@ -77 +77 @@
          */
         CMD_PIO_WRITE_A_32,
-        
+
+        /** Read 1 byte from the memory space. */
+        CMD_MEM_READ_8,
+        /** Read 2 bytes from the memory space. */
+        CMD_MEM_READ_16,
+        /** Read 4 bytes from the memory space. */
+        CMD_MEM_READ_32,
+
+        /** Write 1 byte to the memory space. */
+        CMD_MEM_WRITE_8,
+        /** Write 2 bytes to the memory space. */
+        CMD_MEM_WRITE_16,
+        /** Write 4 bytes to the memory space. */
+        CMD_MEM_WRITE_32,
+
+        /** Write 1 byte from the source argument to the memory space. */
+        CMD_MEM_WRITE_A_8,
+        /** Write 2 bytes from the source argument to the memory space. */
+        CMD_MEM_WRITE_A_16,
+        /** Write 4 bytes from the source argument to the memory space. */
+        CMD_MEM_WRITE_A_32,
+
         /**
          * Perform a bit masking on the source argument
@@ -203 +224 @@
         /** Notification configuration structure. */
         ipc_notif_cfg_t notif_cfg; 
+
+        as_t *driver_as;
 } irq_t;
 

kernel/generic/include/mm/page.h

@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <proc/task.h>
 #include <mm/as.h>
 #include <arch/mm/page.h>
@@ -65 +66 @@
 extern uintptr_t hw_map(uintptr_t, size_t);
 
+extern sysarg_t sys_page_find_mapping(uintptr_t, uintptr_t *);
+
 #endif
 

kernel/generic/include/proc/thread.h

@@ -258 +258 @@
 extern sysarg_t sys_thread_get_id(thread_id_t *);
 extern sysarg_t sys_thread_usleep(uint32_t);
+extern sysarg_t sys_thread_udelay(uint32_t);
 
 #endif

kernel/generic/include/syscall/syscall.h

@@ -44 +44 @@
         SYS_THREAD_GET_ID,
         SYS_THREAD_USLEEP,
+        SYS_THREAD_UDELAY,
         
         SYS_TASK_GET_ID,
@@ -60 +61 @@
         SYS_AS_AREA_DESTROY,
         SYS_AS_GET_UNMAPPED_AREA,
+        
+        SYS_PAGE_FIND_MAPPING,
         
         SYS_IPC_CALL_SYNC_FAST,