Changeset b371844 in mainline for uspace/srv/hw/bus/usb/hcd/virtual/devices.c

Timestamp:

2010-10-10T11:53:05Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b8100da

Parents:

bc9a629

Message:

Virtual HCD refactoring

Splitted into more files, added more comments.

File:

• uspace/srv/hw/bus/usb/hcd/virtual/devices.c (modified) (4 diffs)

uspace/srv/hw/bus/usb/hcd/virtual/devices.c

@@ -31 +31 @@
  */
 /** @file
- * @brief
+ * @brief Virtual device management (implementation).
  */
 
@@ -53 +53 @@
 LIST_INITIALIZE(devices);
 
+/** Recognise device by id.
+ *
+ * @param id Device id.
+ * @param phone Callback phone.
+ */
+virtdev_connection_t *virtdev_recognise(int id, int phone)
+{
+        virtdev_connection_t * dev = NULL;
+        switch (id) {
+                case USB_VIRTDEV_KEYBOARD_ID:
+                        dev = virtdev_add_device(
+                            USB_VIRTDEV_KEYBOARD_ADDRESS, phone);
+                        break;
+                default:
+                        break;
+        }
+        
+        /*
+         * We do not want to mess-up the virtdev_add_device() as
+         * the id is needed only before device probing/detection
+         * is implemented.
+         *
+         * However, that does not mean that this will happen soon.
+         */
+        if (dev) {
+                dev->id = id;
+        }
+        
+        return dev;
+}
+
+/** Find virtual device by its USB address.
+ *
+ * @retval NULL No virtual device at given address.
+ */
 virtdev_connection_t *virtdev_find_by_address(usb_address_t address)
 {
@@ -67 +102 @@
 }
 
+/** Create virtual device.
+ *
+ * @param address USB address.
+ * @param phone Callback phone.
+ * @return New device.
+ * @retval NULL Out of memory or address already occupied.
+ */
 virtdev_connection_t *virtdev_add_device(usb_address_t address, int phone)
 {
+        link_t *pos;
+        list_foreach(pos, &devices) {
+                virtdev_connection_t *dev
+                    = list_get_instance(pos, virtdev_connection_t, link);
+                if (dev->address == address) {
+                        return NULL;
+                }
+        }
+        
         virtdev_connection_t *dev = (virtdev_connection_t *)
             malloc(sizeof(virtdev_connection_t));
@@ -78 +129 @@
 }
 
- void virtdev_destroy_device(virtdev_connection_t *dev)
+/** Destroy virtual device.
+ */
+void virtdev_destroy_device(virtdev_connection_t *dev)
 {
         list_remove(&dev->link);