Changeset 00aece0 in mainline for uspace/app/vuhid/life.c

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

• uspace/app/vuhid/life.c (moved) (moved from uspace/drv/bus/usb/usbmouse/mouse.h ) (1 diff)

uspace/app/vuhid/life.c

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbmouse
+/** @addtogroup usbvirthid
  * @{
  */
 /**
  * @file
- * Common definitions for USB mouse driver.
+ *
  */
+#include <errno.h>
+#include <usb/debug.h>
+#include "virthid.h"
 
-#ifndef USBMOUSE_MOUSE_H_
-#define USBMOUSE_MOUSE_H_
 
-#include <usb/dev/driver.h>
-#include <usb/dev/pipes.h>
-#include <time.h>
-#include <async.h>
+void interface_life_live(vuhid_interface_t *iface)
+{
+        vuhid_interface_life_t *data = iface->interface_data;
+        data->data_in_pos = 0;
+        data->data_in_last_pos = (size_t) -1;
+        async_usleep(1000 * 1000 * 5);
+        usb_log_debug("%s\n", data->msg_born);
+        while (data->data_in_pos < data->data_in_count) {
+                async_usleep(1000 * data->data_in_pos_change_delay);
+                // FIXME: proper locking
+                data->data_in_pos++;
+        }
+        usb_log_debug("%s\n", data->msg_die);
+}
 
-#define POLL_PIPE(dev) \
-        ((dev)->pipes[0].pipe)
 
-/** Container for USB mouse device. */
-typedef struct {
-        /** Generic device container. */
-        usb_device_t *dev;
-        
-        /** Function representing the device. */
-        ddf_fun_t *mouse_fun;
-        
-        /** Polling interval in microseconds. */
-        suseconds_t poll_interval_us;
-        
-        /** Callback session to console (consumer). */
-        async_sess_t *console_sess;
-} usb_mouse_t;
 
-extern usb_endpoint_description_t poll_endpoint_description;
+int interface_live_on_data_in(vuhid_interface_t *iface,
+    void *buffer, size_t buffer_size, size_t *act_buffer_size)
+{
+        vuhid_interface_life_t *life = iface->interface_data;
+        size_t pos = life->data_in_pos;
+        if (pos >= life->data_in_count) {
+                return EBADCHECKSUM;
+        }
 
-extern int usb_mouse_create(usb_device_t *);
-extern bool usb_mouse_polling_callback(usb_device_t *, uint8_t *, size_t,
-    void *);
-extern void usb_mouse_polling_ended_callback(usb_device_t *, bool, void *);
+        if (pos == life->data_in_last_pos) {
+                return ENAK;
+        }
 
-#endif
+        if (buffer_size > iface->in_data_size) {
+                buffer_size = iface->in_data_size;
+        }
 
-/**
- * @}
+        if (act_buffer_size != NULL) {
+                *act_buffer_size = buffer_size;
+        }
+
+        memcpy(buffer, life->data_in + pos * iface->in_data_size, buffer_size);
+        life->data_in_last_pos = pos;
+
+        return EOK;
+}
+
+/** @}
  */