Changeset f126c87 in mainline for uspace/drv/bus/usb/ohci/hc.h

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

• uspace/drv/bus/usb/ohci/hc.h (modified) (3 diffs)

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

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbohci
  * @{
@@ -32 +33 @@
  * @brief OHCI host controller driver structure
  */
+
 #ifndef DRV_OHCI_HC_H
 #define DRV_OHCI_HC_H
@@ -78 +80 @@
 } hc_t;
 
-int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts);
-void hc_fini(hc_t *instance);
+extern int hc_init(hc_t *, const hw_res_list_parsed_t *, bool);
+extern void hc_fini(hc_t *);
 
-void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep);
-void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep);
+extern void hc_enqueue_endpoint(hc_t *, const endpoint_t *);
+extern void hc_dequeue_endpoint(hc_t *, const endpoint_t *);
 
 int ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
 
-void ohci_hc_interrupt(hcd_t *hcd, uint32_t status);
-int ohci_hc_status(hcd_t *hcd, uint32_t *status);
-int ohci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
+extern void ohci_hc_interrupt(hcd_t *, uint32_t);
+extern int ohci_hc_status(hcd_t *, uint32_t *);
+extern int ohci_hc_schedule(hcd_t *, usb_transfer_batch_t *);
+
 #endif
+
 /**
  * @}