Changeset 8e7c9fe in mainline for uspace/drv/bus/usb/usbhid/blink1/blink1.h

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/drv/bus/usb/usbhid/blink1/blink1.h (moved) (moved from kernel/arch/mips64/include/arch/arch.h ) (2 diffs)

uspace/drv/bus/usb/usbhid/blink1/blink1.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2014 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mips64
+/** @addtogroup drvusbhid
  * @{
  */
 /** @file
+ * USB blink(1) subdriver.
  */
 
-#ifndef KERN_mips64_ARCH_H_
-#define KERN_mips64_ARCH_H_
+#ifndef USB_HID_BLINK1_H_
+#define USB_HID_BLINK1_H_
 
-#include <typedefs.h>
+#include <usb/dev/driver.h>
+#include "../usbhid.h"
 
-#define TASKMAP_MAX_RECORDS        32
-#define CPUMAP_MAX_RECORDS         32
-#define BOOTINFO_TASK_NAME_BUFLEN  32
+/** Container for USB blink(1) device. */
+typedef struct {
+        /** DDF blink(1) function */
+        ddf_fun_t *fun;
+        
+        /** USB HID device */
+        usb_hid_dev_t *hid_dev;
+} usb_blink1_t;
 
-extern size_t cpu_count;
+extern const char *HID_BLINK1_FUN_NAME;
+extern const char *HID_BLINK1_CATEGORY;
 
-typedef struct {
-        void *addr;
-        size_t size;
-        char name[BOOTINFO_TASK_NAME_BUFLEN];
-} utask_t;
+extern int usb_blink1_init(usb_hid_dev_t *, void **);
+extern void usb_blink1_deinit(usb_hid_dev_t *, void *);
 
-typedef struct {
-        uint32_t cpumap;
-        size_t cnt;
-        utask_t tasks[TASKMAP_MAX_RECORDS];
-} bootinfo_t;
+#endif // USB_HID_BLINK1_H_
 
-extern void arch_pre_main(void *entry, bootinfo_t *bootinfo);
-
-#endif
-
-/** @}
+/**
+ * @}
  */