Changeset fe1776c2 in mainline for uspace/drv/usbhid/main.c

Timestamp:

2011-02-11T12:41:11Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d81ef61c

Parents:

78d1525 (diff), 5d4193c (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 from usb/development

File:

• uspace/drv/usbhid/main.c (modified) (7 diffs)

uspace/drv/usbhid/main.c

@@ -56 +56 @@
 #include "layout.h"
 
-#define BUFFER_SIZE 32
+#define BUFFER_SIZE 8
 #define NAME "usbhid"
 
@@ -83 +83 @@
 
                 if (console_callback_phone != -1) {
-                        ipc_answer_0(icallid, ELIMIT);
+                        async_answer_0(icallid, ELIMIT);
                         return;
                 }
 
                 console_callback_phone = callback;
-                ipc_answer_0(icallid, EOK);
+                async_answer_0(icallid, EOK);
                 return;
         }
 
-        ipc_answer_0(icallid, EINVAL);
+        async_answer_0(icallid, EINVAL);
 }
 
@@ -262 +262 @@
 }
 
+# if 0
 /*
  * Kbd functions
@@ -297 +298 @@
         return EOK;
 }
-
 static int usbkbd_process_descriptors(usb_hid_dev_kbd_t *kbd_dev)
 {
@@ -363 +363 @@
         return EOK;
 }
-
+#endif
 static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
 {
@@ -404 +404 @@
          */
 
+
         // TODO: get descriptors, parse descriptors and save endpoints
-        usbkbd_process_descriptors(kbd_dev);
+        //usbkbd_process_descriptors(kbd_dev);
+        usb_drv_req_set_configuration(
+          kbd_dev->device->parent_phone, kbd_dev->address, 1);
 
 
@@ -467 +470 @@
 
         while (true) {
-                async_usleep(1000 * 1000 * 2);
+                async_usleep(1000 * 10);
 
                 sess_rc = usb_endpoint_pipe_start_session(&kbd_dev->poll_pipe);