Changeset 2b621cb in mainline

Timestamp:

2011-12-28T13:05:59Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8afeb04

Parents:

295f658

Message:

usbhid: Remove useless structure members. Rename references to console.

Location:

uspace/drv/bus/usb/usbhid

Files:

• kbd/kbddev.c (modified) (7 diffs)
• kbd/kbddev.h (modified) (1 diff)
• mouse/mousedev.c (modified) (4 diffs)
• mouse/mousedev.h (modified) (2 diffs)

uspace/drv/bus/usb/usbhid/kbd/kbddev.c

@@ -71 +71 @@
 #include "../usbhid.h"
 
+static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
+static ddf_dev_ops_t kbdops = { .default_handler = default_connection_handler };
 /*----------------------------------------------------------------------------*/
 
@@ -187 +189 @@
                         break;
                 }
-                if (kbd_dev->console_sess == NULL) {
-                        kbd_dev->console_sess = sess;
+                if (kbd_dev->client_sess == NULL) {
+                        kbd_dev->client_sess = sess;
                         usb_log_debug("%s: OK\n", __FUNCTION__);
                         async_answer_0(icallid, EOK);
@@ -292 +294 @@
 {
         usb_log_debug2("Sending kbdev event %d/%d to the console\n", type, key);
-        if (kbd_dev->console_sess == NULL) {
+        if (kbd_dev->client_sess == NULL) {
                 usb_log_warning(
                     "Connection to console not ready, key discarded.\n");
@@ -298 +300 @@
         }
 
-        async_exch_t *exch = async_exchange_begin(kbd_dev->console_sess);
+        async_exch_t *exch = async_exchange_begin(kbd_dev->client_sess);
         if (exch != NULL) {
                 async_msg_2(exch, KBDEV_EVENT, type, key);
@@ -499 +501 @@
         /* Store the initialized HID device and HID ops
          * to the DDF function. */
-        fun->ops = &kbd_dev->ops;
+        fun->ops = &kbdops;
         fun->driver_data = kbd_dev;
 
@@ -576 +578 @@
         fibril_mutex_initialize(&kbd_dev->repeat_mtx);
         kbd_dev->initialized = USB_KBD_STATUS_UNINITIALIZED;
-        kbd_dev->ops.default_handler = default_connection_handler;
 
         /* Store link to HID device */
@@ -737 +738 @@
 
         /* Hangup session to the console. */
-        if (kbd_dev->console_sess)
-                async_hangup(kbd_dev->console_sess);
+        if (kbd_dev->client_sess)
+                async_hangup(kbd_dev->client_sess);
 
         //assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));

uspace/drv/bus/usb/usbhid/kbd/kbddev.h

@@ -82 +82 @@
         unsigned lock_keys;
 
-        /** IPC session to the console device (for sending key events). */
-        async_sess_t *console_sess;
-
-        /** @todo What is this actually? */
-        ddf_dev_ops_t ops;
+        /** IPC session to client (for sending key events). */
+        async_sess_t *client_sess;
 
         /** Information for auto-repeat of keys. */

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -57 +57 @@
 #define NAME "mouse"
 
-/*----------------------------------------------------------------------------*/
-
+static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
+
+static ddf_dev_ops_t ops = { .default_handler = default_connection_handler };
+
+/*----------------------------------------------------------------------------*/
 const usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description = {
         .transfer_type = USB_TRANSFER_INTERRUPT,
@@ -307 +310 @@
         }
 
-        fun->ops = &mouse->ops;
+        fun->ops = &ops;
         fun->driver_data = mouse;
 
@@ -350 +353 @@
          * to the DDF function.
          */
-        fun->ops = &mouse->ops;
+        fun->ops = &ops;
         fun->driver_data = mouse;
 
@@ -458 +461 @@
         }
 
-        // set handler for incoming calls
-        mouse_dev->ops.default_handler = default_connection_handler;
-
         // TODO: how to know if the device supports the request???
         usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe,

uspace/drv/bus/usb/usbhid/mouse/mousedev.h

@@ -46 +46 @@
 /** Container for USB mouse device. */
 typedef struct {
-        /** IPC session to console (consumer). */
+        /** IPC session to consumer. */
         async_sess_t *mouse_sess;
         async_sess_t *wheel_sess;
@@ -54 +54 @@
         size_t buttons_count;
 
-        ddf_dev_ops_t ops;
         /* DDF mouse function */
         ddf_fun_t *mouse_fun;