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

Timestamp:

2011-06-01T08:43:42Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• uspace/drv/usbhid/subdrivers.c (moved) (moved from uspace/lib/net/include/netif_interface.h ) (2 diffs)

uspace/drv/usbhid/subdrivers.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Lubos Slovak
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/** @addtogroup drvusbhid
  * @{
  */
+/** @file
+ * USB HID subdriver mappings.
+ */
 
-#ifndef LIBNET_NETIF_INTERFACE_H_
-#define LIBNET_NETIF_INTERFACE_H_
+#include "subdrivers.h"
+#include <usb/hid/usages/core.h>
+#include <usb/hid/hidpath.h>
 
-#include <netif_remote.h>
-#include <packet_client.h>
+#include "multimedia/multimedia.h"
+#include "mouse/mousedev.h"
+#include "generic/hiddev.h"
 
-#define netif_module_message    netif_module_message_standalone
-#define netif_module_start      netif_module_start_standalone
-#define netif_get_addr_req      netif_get_addr_req_remote
-#define netif_probe_req         netif_probe_req_remote
-#define netif_send_msg          netif_send_msg_remote
-#define netif_start_req         netif_start_req_remote
-#define netif_stop_req          netif_stop_req_remote
-#define netif_stats_req         netif_stats_req_remote
-#define netif_bind_service      netif_bind_service_remote
+static usb_hid_subdriver_usage_t path_kbd[] = {
+        {USB_HIDUT_PAGE_GENERIC_DESKTOP, 
+         USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD}, 
+        {0, 0}
+};
 
-#endif
+static usb_hid_subdriver_usage_t path_mouse[] = {
+        {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE},
+        {0, 0}
+};
 
-/** @}
+static usb_hid_subdriver_usage_t multim_key_path[] = {
+        {USB_HIDUT_PAGE_CONSUMER, USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL},
+        {0, 0}
+};
+
+const usb_hid_subdriver_mapping_t usb_hid_subdrivers[] = {
+        {
+                path_kbd,
+                0,
+                USB_HID_PATH_COMPARE_BEGIN,
+                -1,
+                -1,
+                {
+                        .init = usb_kbd_init,
+                        .deinit = usb_kbd_deinit,
+                        .poll = usb_kbd_polling_callback,
+                        .poll_end = NULL
+                },
+                
+        },
+        {
+                multim_key_path,
+                1,
+                USB_HID_PATH_COMPARE_BEGIN,
+                -1,
+                -1,
+                {
+                        .init = usb_multimedia_init,
+                        .deinit = usb_multimedia_deinit,
+                        .poll = usb_multimedia_polling_callback,
+                        .poll_end = NULL
+                }
+        },
+        {
+                path_mouse,
+                0,
+                USB_HID_PATH_COMPARE_BEGIN,
+                -1,
+                -1,
+                {
+                        .init = usb_mouse_init,
+                        .deinit = usb_mouse_deinit,
+                        .poll = usb_mouse_polling_callback,
+                        .poll_end = NULL
+                }
+        },
+        {NULL, -1, 0, -1, -1, {NULL, NULL, NULL, NULL, NULL}}
+};
+
+/**
+ * @}
  */