Changes in / [103cf26:a763eb4] in mainline

Location:

uspace

Files:

• app/netstart/self_test.c (deleted)
• app/netstart/self_test.h (deleted)
• drv/usbhid/hiddev.c (modified) (1 diff)
• drv/usbhid/hiddev.h (modified) (1 diff)
• drv/usbhid/kbddev.c (modified) (10 diffs)
• drv/usbhid/kbddev.h (modified) (2 diffs)
• drv/usbhid/kbdrepeat.c (modified) (1 diff)
• lib/packet/include/net_byteorder.h (added)
• lib/packet/include/net_err.h (added)
• lib/packet/include/socket_errno.h (added)

uspace/drv/usbhid/hiddev.c

@@ -440 +440 @@
         if (rc != EOK) {
                 /* TODO: end session?? */
-                usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
                 usb_log_error("Failed to process descriptors: %s.\n",
                     str_error(rc));

uspace/drv/usbhid/hiddev.h

@@ -32 +32 @@
 /** @file
  * Generic USB HID device structure and API.
- *
- * @todo Add function for parsing report - this is generic HID function, not
- *       keyboard-specific, as the report parser is also generic.
- * @todo Add function for polling as that is also a generic HID process.
- * @todo Add interrupt in pipe to the structure.
  */
 

uspace/drv/usbhid/kbddev.c

@@ -94 +94 @@
         .flags = 0
 };
-
-typedef enum usbhid_kbd_flags {
-        USBHID_KBD_STATUS_UNINITIALIZED = 0,
-        USBHID_KBD_STATUS_INITIALIZED = 1,
-        USBHID_KBD_STATUS_TO_DESTROY = -1
-} usbhid_kbd_flags;
 
 /*----------------------------------------------------------------------------*/
@@ -238 +232 @@
         
         assert(kbd_dev->hid_dev != NULL);
-        assert(kbd_dev->hid_dev->initialized == USBHID_KBD_STATUS_INITIALIZED);
+        assert(kbd_dev->hid_dev->initialized);
         usbhid_req_set_report(kbd_dev->hid_dev, USB_HID_REPORT_TYPE_OUTPUT, 
             buffer, BOOTP_BUFFER_OUT_SIZE);
@@ -571 +565 @@
                                     uint8_t *buffer, size_t actual_size)
 {
-        assert(kbd_dev->initialized == USBHID_KBD_STATUS_INITIALIZED);
+        assert(kbd_dev->initialized);
         assert(kbd_dev->hid_dev->parser != NULL);
         
@@ -625 +619 @@
         
         kbd_dev->console_phone = -1;
-        kbd_dev->initialized = USBHID_KBD_STATUS_UNINITIALIZED;
+        kbd_dev->initialized = 0;
         
         return kbd_dev;
@@ -631 +625 @@
 
 /*----------------------------------------------------------------------------*/
-
-static void usbhid_kbd_mark_unusable(usbhid_kbd_t *kbd_dev)
-{
-        kbd_dev->initialized = USBHID_KBD_STATUS_TO_DESTROY;
+/**
+ * Properly destroys the USB/HID keyboard structure.
+ *
+ * @param kbd_dev Pointer to the structure to be destroyed.
+ */
+static void usbhid_kbd_free(usbhid_kbd_t **kbd_dev)
+{
+        if (kbd_dev == NULL || *kbd_dev == NULL) {
+                return;
+        }
+        
+        // hangup phone to the console
+        async_hangup((*kbd_dev)->console_phone);
+        
+        if ((*kbd_dev)->hid_dev != NULL) {
+                usbhid_dev_free(&(*kbd_dev)->hid_dev);
+                assert((*kbd_dev)->hid_dev == NULL);
+        }
+        
+        if ((*kbd_dev)->repeat_mtx != NULL) {
+                /* TODO: replace by some check and wait */
+                assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));
+                free((*kbd_dev)->repeat_mtx);
+        }
+
+        free(*kbd_dev);
+        *kbd_dev = NULL;
 }
 
@@ -676 +693 @@
         }
         
-        if (kbd_dev->initialized == USBHID_KBD_STATUS_INITIALIZED) {
+        if (kbd_dev->initialized) {
                 usb_log_warning("Keyboard structure already initialized.\n");
                 return EINVAL;
@@ -689 +706 @@
         }
         
-        assert(kbd_dev->hid_dev->initialized == USBHID_KBD_STATUS_INITIALIZED);
+        assert(kbd_dev->hid_dev->initialized);
         
         // save the size of the report (boot protocol report by default)
@@ -741 +758 @@
         usbhid_req_set_idle(kbd_dev->hid_dev, IDLE_RATE);
         
-        kbd_dev->initialized = USBHID_KBD_STATUS_INITIALIZED;
+        kbd_dev->initialized = 1;
         usb_log_info("HID/KBD device structure initialized.\n");
         
@@ -855 +872 @@
         usbhid_kbd_poll(kbd_dev);
         
-        // as there is another fibril using this device, so we must leave the
-        // structure to it, but mark it for destroying.
-        usbhid_kbd_mark_unusable(kbd_dev);
         // at the end, properly destroy the KBD structure
-//      usbhid_kbd_free(&kbd_dev);
-//      assert(kbd_dev == NULL);
+        usbhid_kbd_free(&kbd_dev);
+        assert(kbd_dev == NULL);
 
         return EOK;
@@ -982 +996 @@
 }
 
-/*----------------------------------------------------------------------------*/
-
-int usbhid_kbd_is_usable(const usbhid_kbd_t *kbd_dev)
-{
-        return (kbd_dev->initialized == USBHID_KBD_STATUS_INITIALIZED);
-}
-
-/*----------------------------------------------------------------------------*/
-/**
- * Properly destroys the USB/HID keyboard structure.
- *
- * @param kbd_dev Pointer to the structure to be destroyed.
- */
-void usbhid_kbd_free(usbhid_kbd_t **kbd_dev)
-{
-        if (kbd_dev == NULL || *kbd_dev == NULL) {
-                return;
-        }
-        
-        // hangup phone to the console
-        async_hangup((*kbd_dev)->console_phone);
-        
-        if ((*kbd_dev)->hid_dev != NULL) {
-                usbhid_dev_free(&(*kbd_dev)->hid_dev);
-                assert((*kbd_dev)->hid_dev == NULL);
-        }
-        
-        if ((*kbd_dev)->repeat_mtx != NULL) {
-                /* TODO: replace by some check and wait */
-                assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));
-                free((*kbd_dev)->repeat_mtx);
-        }
-
-        free(*kbd_dev);
-        *kbd_dev = NULL;
-}
-
 /**
  * @}

uspace/drv/usbhid/kbddev.h

@@ -101 +101 @@
         fibril_mutex_t *repeat_mtx;
         
-        /** State of the structure (for checking before use). 
-         * 
-         * 0 - not initialized
-         * 1 - initialized
-         * -1 - ready for destroying
-         */
+        /** State of the structure (for checking before use). */
         int initialized;
 } usbhid_kbd_t;
@@ -113 +108 @@
 
 int usbhid_kbd_try_add_device(ddf_dev_t *dev);
-
-int usbhid_kbd_is_usable(const usbhid_kbd_t *kbd_dev);
-
-void usbhid_kbd_free(usbhid_kbd_t **kbd_dev);
 
 void usbhid_kbd_push_ev(usbhid_kbd_t *kbd_dev, int type, unsigned int key);

uspace/drv/usbhid/kbdrepeat.c

@@ -77 +77 @@
 
         while (true) {
-                // check if the kbd structure is usable
-                if (!usbhid_kbd_is_usable(kbd)) {
-                        usbhid_kbd_free(&kbd);
-                        assert(kbd == NULL);
-                        return;
-                }
-                
                 fibril_mutex_lock(kbd->repeat_mtx);