Changeset 57e06ef in mainline

Timestamp:

2011-10-28T22:19:29Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2fd1f0c6

Parents:

48ae3ef

Message:

ohci: Minor improvements.

Remove unused member.
Fix comments.
Add const qualifiers and asserts.

Location:

uspace/drv/bus/usb/ohci

Files:

• endpoint_list.c (modified) (1 diff)
• endpoint_list.h (modified) (1 diff)
• hc.c (modified) (2 diffs)
• hc.h (modified) (1 diff)
• ohci_endpoint.c (modified) (3 diffs)
• ohci_endpoint.h (modified) (2 diffs)

uspace/drv/bus/usb/ohci/endpoint_list.c

@@ -73 +73 @@
  * Does not check whether this replaces an existing list.
  */
-void endpoint_list_set_next(endpoint_list_t *instance, endpoint_list_t *next)
+void endpoint_list_set_next(
+    const endpoint_list_t *instance, const endpoint_list_t *next)
 {
         assert(instance);

uspace/drv/bus/usb/ohci/endpoint_list.h

@@ -68 +68 @@
 
 int endpoint_list_init(endpoint_list_t *instance, const char *name);
-void endpoint_list_set_next(endpoint_list_t *instance, endpoint_list_t *next);
+void endpoint_list_set_next(
+    const endpoint_list_t *instance, const endpoint_list_t *next);
 void endpoint_list_add_ep(endpoint_list_t *instance, ohci_endpoint_t *ep);
 void endpoint_list_remove_ep(endpoint_list_t *instance, ohci_endpoint_t *ep);

uspace/drv/bus/usb/ohci/hc.c

@@ -221 +221 @@
 }
 /*----------------------------------------------------------------------------*/
-void hc_enqueue_endpoint(hc_t *instance, endpoint_t *ep)
-{
+void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep)
+{
+        assert(instance);
+        assert(ep);
+
         endpoint_list_t *list = &instance->lists[ep->transfer_type];
         ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ep);
+        assert(list);
+        assert(ohci_ep);
+
         /* Enqueue ep */
         switch (ep->transfer_type) {
@@ -247 +253 @@
 }
 /*----------------------------------------------------------------------------*/
-void hc_dequeue_endpoint(hc_t *instance, endpoint_t *ep)
-{
+void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep)
+{
+        assert(instance);
+        assert(ep);
+
         /* Dequeue ep */
         endpoint_list_t *list = &instance->lists[ep->transfer_type];
         ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ep);
+
+        assert(list);
+        assert(ohci_ep);
         switch (ep->transfer_type) {
         case USB_TRANSFER_CONTROL:

uspace/drv/bus/usb/ohci/hc.h

@@ -86 +86 @@
 static inline void hc_fini(hc_t *instance) { /* TODO: implement*/ };
 
-void hc_enqueue_endpoint(hc_t *instance, endpoint_t *ep);
-void hc_dequeue_endpoint(hc_t *instance, endpoint_t *ep);
+void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep);
+void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep);
 
 void hc_interrupt(hc_t *instance, uint32_t status);

uspace/drv/bus/usb/ohci/ohci_endpoint.c

@@ -65 +65 @@
  *
  * @param[in] ep USBD endpoint structure
- * @return pointer to a new hcd endpoint structure, NULL on failure.
+ * @return Error code.
  */
 int ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep)
@@ -90 +90 @@
         endpoint_set_hc_data(
             ep, ohci_ep, ohci_ep_toggle_get, ohci_ep_toggle_set);
-        ohci_ep->hcd = hcd;
         hc_enqueue_endpoint(hcd->private_data, ep);
         return EOK;
@@ -97 +96 @@
 /** Disposes hcd endpoint structure
  *
- * @param[in] hcd_ep endpoint structure
+ * @param[in] hcd driver using this instance.
+ * @param[in] ep endpoint structure.
  */
 void ohci_endpoint_fini(hcd_t *hcd, endpoint_t *ep)

uspace/drv/bus/usb/ohci/ohci_endpoint.h

@@ -51 +51 @@
         /** Linked list used by driver software */
         link_t link;
-        /** Device using this ep */
-        hcd_t *hcd;
 } ohci_endpoint_t;
 
@@ -62 +60 @@
  * @return Pointer to assigned hcd endpoint structure
  */
-static inline ohci_endpoint_t * ohci_endpoint_get(endpoint_t *ep)
+static inline ohci_endpoint_t * ohci_endpoint_get(const endpoint_t *ep)
 {
         assert(ep);