Changeset d8b275d in mainline for uspace/drv/usbhid/subdrivers.c

Timestamp:

2011-04-14T08:24:29Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5e07e2b5

Parents:

3f2af64 (diff), 34e8bab (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 development/ changes

File:

• uspace/drv/usbhid/subdrivers.c (moved) (moved from kernel/generic/src/proc/tasklet.c ) (2 diffs)

uspace/drv/usbhid/subdrivers.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2007 Jan Hudecek
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2011 Lubos Slovak
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup genericproc
+/** @addtogroup drvusbhid
  * @{
  */
-/** @file tasklet.c
- *  @brief Tasklet implementation
+/** @file
+ * USB HID subdriver mappings.
  */
 
-#include <proc/tasklet.h>
-#include <synch/spinlock.h>
-#include <mm/slab.h>
-#include <config.h>
+#include "subdrivers.h"
+#include "usb/classes/hidut.h"
 
-/** Spinlock protecting list of tasklets */
-SPINLOCK_INITIALIZE(tasklet_lock);
+static usb_hid_subdriver_usage_t path_kbd[] = {{USB_HIDUT_PAGE_KEYBOARD, 0}};
 
-/** Array of tasklet lists for every CPU */
-tasklet_descriptor_t **tasklet_list;
+const usb_hid_subdriver_mapping_t usb_hid_subdrivers[] = {
+        {
+                path_kbd,
+                1,
+                USB_HID_PATH_COMPARE_END 
+                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                NULL,
+                NULL,
+                {
+                        usb_kbd_init,
+                        usb_kbd_deinit,
+                        usb_kbd_polling_callback,
+                        NULL
+                },
+                
+        },
+        {NULL, 0, 0, NULL, NULL, {NULL, NULL, NULL, NULL}}
+};
 
-void tasklet_init(void)
-{
-        unsigned int i;
-        
-        tasklet_list = malloc(sizeof(tasklet_descriptor_t *) * config.cpu_count, 0);
-        if (!tasklet_list)
-                panic("Error initializing tasklets.");
-        
-        for (i = 0; i < config.cpu_count; i++)
-                tasklet_list[i] = NULL;
-        
-        spinlock_initialize(&tasklet_lock, "tasklet_lock");
-}
-
-
-/** @}
+/**
+ * @}
  */