Changeset 9d9ffdd in mainline for uspace/drv/usbmouse/main.c

Timestamp:

2011-03-11T15:42:43Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

0bd4810c

Parents:

60a228f (diff), a8def7d (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 hidd

File:

• uspace/drv/usbmouse/main.c (moved) (moved from uspace/lib/usb/include/usb/usbmem.h ) (2 diffs)

uspace/drv/usbmouse/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Matus Dekanek
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef USBMEM_H
-#define USBMEM_H
-
-
-// group should be changed - this is not usb specific
-/** @addtogroup usb
+/** @addtogroup drvusbmouse
  * @{
  */
-/** @file definitions of memory management with address translation, used mostly in usb stack
+/**
+ * @file
+ * Main routines of USB boot protocol mouse driver.
+ */
+#include "mouse.h"
+#include <usb/debug.h>
+#include <errno.h>
+#include <str_error.h>
+
+/** Callback when new mouse device is attached and recognised by DDF.
  *
- * USB HCD needs traslation between physical and virtual addresses. These
- * functions implement such functionality. For each allocated virtual address
- * the memory manager gets also it`s physical translation and remembers it.
- * Addresses allocated byt this manager can be therefore translated from and to
- * physical addresses.
- * Typical use:
- * void * address = mman_malloc(some_size);
- * void * physical_address = mman_getPA(address);
- * void * the_same_address = mman_getVA(physical_address);
- * void * null_address = mman_getPA(non_existing_address);
- * mman_free(address);
- * // physical_address, adress and the_same_address are no longer valid here
- *
- *
- * @note Addresses allocated by this memory manager should be as well
- * deallocated byt it.
- *
+ * @param dev Representation of a generic DDF device.
+ * @return Error code.
  */
+static int usbmouse_add_device(ddf_dev_t *dev)
+{
+        int rc = usb_mouse_create(dev);
+        if (rc != EOK) {
+                usb_log_error("Failed to initialize device driver: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
 
-#include <sys/types.h>
+        fid_t poll_fibril = fibril_create(usb_mouse_polling_fibril, dev);
+        if (poll_fibril == 0) {
+                usb_log_error("Failed to initialize polling fibril.\n");
+                /* FIXME: free allocated resources. */
+                return ENOMEM;
+        }
 
-extern void * mman_malloc(
-    size_t size,
-    size_t alignment,
-    unsigned long max_physical_address);
+        fibril_add_ready(poll_fibril);
 
-extern void * mman_getVA(void * addr);
+        usb_log_info("controlling new mouse (handle %llu).\n",
+            dev->handle);
 
-extern void * mman_getPA(void * addr);
+        return EOK;
+}
 
-extern void mman_free(void * addr);
+/** USB mouse driver ops. */
+static driver_ops_t mouse_driver_ops = {
+        .add_device = usbmouse_add_device,
+};
 
+/** USB mouse driver. */
+static driver_t mouse_driver = {
+        .name = NAME,
+        .driver_ops = &mouse_driver_ops
+};
 
+int main(int argc, char *argv[])
+{
+        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 
+        return ddf_driver_main(&mouse_driver);
+}
 
-
-
-/** @}
+/**
+ * @}
  */
-
-
-#endif  /* USBMEM_H */
-