Changeset 1924bd43 in mainline for uspace/app

Timestamp:

2011-09-25T12:07:26Z (15 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

5dd4f77a

Parents:

6fe0bf8d (diff), 113093a (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 with mainline

Location:

uspace/app/vuhid

Files:

• Makefile (modified) (2 diffs)
• hids/bootkbd.c (modified) (3 diffs)
• hids/logitech_wireless.c (added)
• ifaces.c (modified) (1 diff)
• life.c (added)
• virthid.h (modified) (2 diffs)

uspace/app/vuhid/Makefile

@@ -47 +47 @@
 
 SOURCES_INTERFACES = \
-        hids/bootkbd.c
+        hids/bootkbd.c \
+        hids/logitech_wireless.c
 
 SOURCES = \
@@ -53 +54 @@
         device.c \
         ifaces.c \
+        life.c \
         stdreq.c \
         $(SOURCES_INTERFACES)

uspace/app/vuhid/hids/bootkbd.c

@@ -93 +93 @@
              0, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
-static size_t in_data_count = sizeof(in_data)/INPUT_SIZE;
-// FIXME - locking
-static size_t in_data_position = 0;
-
-static int on_data_in(vuhid_interface_t *iface,
-    void *buffer, size_t buffer_size, size_t *act_buffer_size)
-{
-        static size_t last_pos = (size_t) -1;
-        size_t pos = in_data_position;
-        if (pos >= in_data_count) {
-                return EBADCHECKSUM;
-        }
-
-        if (last_pos == pos) {
-                return ENAK;
-        }
-
-        if (buffer_size > INPUT_SIZE) {
-                buffer_size = INPUT_SIZE;
-        }
-
-        if (act_buffer_size != NULL) {
-                *act_buffer_size = buffer_size;
-        }
-
-        memcpy(buffer, in_data + pos * INPUT_SIZE, buffer_size);
-        last_pos = pos;
-
-        return EOK;
-}
+static vuhid_interface_life_t boot_life = {
+        .data_in = in_data,
+        .data_in_count = sizeof(in_data)/INPUT_SIZE,
+        .data_in_pos_change_delay = 500,
+        .msg_born = "Boot keyboard comes to life...",
+        .msg_die = "Boot keyboard died."
+};
 
 static int on_data_out(vuhid_interface_t *iface,
@@ -141 +118 @@
 }
 
-
-static void live(vuhid_interface_t *iface)
-{
-        async_usleep(1000 * 1000 * 5);
-        usb_log_debug("Boot keyboard comes to life...\n");
-        while (in_data_position < in_data_count) {
-                async_usleep(1000 * 500);
-                in_data_position++;
-        }
-        usb_log_debug("Boot keyboard died.\n");
-}
-
-
 vuhid_interface_t vuhid_interface_bootkbd = {
         .id = "boot",
@@ -164 +128 @@
 
         .in_data_size = INPUT_SIZE,
-        .on_data_in = on_data_in,
+        .on_data_in = interface_live_on_data_in,
 
         .out_data_size = 1,
         .on_data_out = on_data_out,
 
-        .live = live,
+        .live = interface_life_live,
 
+        .interface_data = &boot_life,
         .vuhid_data = NULL
 };

uspace/app/vuhid/ifaces.c

@@ -38 +38 @@
 
 extern vuhid_interface_t vuhid_interface_bootkbd;
+extern vuhid_interface_t vuhid_interface_logitech_wireless_1;
 
 vuhid_interface_t *available_hid_interfaces[] = {
         &vuhid_interface_bootkbd,
+        &vuhid_interface_logitech_wireless_1,
         NULL
 };

uspace/app/vuhid/virthid.h

@@ -82 +82 @@
 
 typedef struct {
+        /** Buffer with data from device to the host. */
+        uint8_t *data_in;
+        /** Number of items in @c data_in.
+         * The total size of @c data_in buffer shall be
+         * <code>data_in_count * vuhid_interface_t.in_data_size</code>.
+         */
+        size_t data_in_count;
+
+        /** Current position in the data buffer. */
+        size_t data_in_pos;
+        /** Previous position. */
+        size_t data_in_last_pos;
+
+        /** Delay between transition to "next" input buffer (in ms). */
+        size_t data_in_pos_change_delay;
+
+        /** Message to print when interface becomes alive. */
+        const char *msg_born;
+        /** Message to print when interface dies. */
+        const char *msg_die;
+} vuhid_interface_life_t;
+
+typedef struct {
         uint8_t length;
         uint8_t type;
@@ -94 +117 @@
 void wait_for_interfaces_death(usbvirt_device_t *);
 
+void interface_life_live(vuhid_interface_t *);
+int interface_live_on_data_in(vuhid_interface_t *, void *, size_t, size_t *);
+
+
 #endif
 /**