Index: uspace/drv/bus/usb/ehci/main.c =================================================================== --- uspace/drv/bus/usb/ehci/main.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ehci/main.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -27,4 +27,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbehci * @{ @@ -33,4 +34,5 @@ * Main routines of EHCI driver. */ + #include #include @@ -70,5 +72,6 @@ -static int ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq) +static int ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, + bool irq) { assert(hcd); @@ -138,4 +141,5 @@ return ddf_driver_main(&ehci_driver); } + /** * @} Index: uspace/drv/bus/usb/ehci/res.h =================================================================== --- uspace/drv/bus/usb/ehci/res.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ehci/res.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -39,5 +39,5 @@ #include -int disable_legacy(ddf_dev_t *); +extern int disable_legacy(ddf_dev_t *); #endif Index: uspace/drv/bus/usb/ohci/endpoint_list.h =================================================================== --- uspace/drv/bus/usb/ohci/endpoint_list.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/endpoint_list.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -76,5 +76,7 @@ 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); + #endif + /** * @} Index: uspace/drv/bus/usb/ohci/hc.c =================================================================== --- uspace/drv/bus/usb/ohci/hc.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/hc.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -177,5 +177,5 @@ usb_log_error("Failed to create OHCI memory structures: %s.\n", str_error(ret)); - //TODO: We should disable pio access here + // TODO: We should disable pio access here return ret; } @@ -393,5 +393,5 @@ ohci_emulation_reg, OHCI_RD(*ohci_emulation_reg)); /* Zero everything but A20State */ - //TODO: should we ack interrupts before doing this? + // TODO: should we ack interrupts before doing this? OHCI_CLR(*ohci_emulation_reg, ~0x100); usb_log_debug( @@ -403,5 +403,5 @@ if (OHCI_RD(instance->registers->control) & C_IR) { usb_log_debug("SMM driver: request ownership change.\n"); - //TODO: should we ack interrupts before doing this? + // TODO: should we ack interrupts before doing this? OHCI_SET(instance->registers->command_status, CS_OCR); /* Hope that SMM actually knows its stuff or we can hang here */ Index: uspace/drv/bus/usb/ohci/hc.h =================================================================== --- uspace/drv/bus/usb/ohci/hc.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/hc.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbohci * @{ @@ -32,4 +33,5 @@ * @brief OHCI host controller driver structure */ + #ifndef DRV_OHCI_HC_H #define DRV_OHCI_HC_H @@ -78,16 +80,18 @@ } 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 + /** * @} Index: uspace/drv/bus/usb/ohci/hw_struct/completion_codes.h =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/completion_codes.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/hw_struct/completion_codes.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -54,5 +54,5 @@ }; -inline static unsigned cc_to_rc(unsigned cc) +inline static unsigned int cc_to_rc(unsigned int cc) { switch (cc) { Index: uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbohci * @{ Index: uspace/drv/bus/usb/ohci/hw_struct/hcca.h =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/hcca.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/hw_struct/hcca.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbohci * @{ @@ -32,4 +33,5 @@ * @brief OHCI driver */ + #ifndef DRV_OHCI_HW_STRUCT_HCCA_H #define DRV_OHCI_HW_STRUCT_HCCA_H @@ -85,5 +87,7 @@ OHCI_MEM32_WR(hcca->int_ep[index], pa); } + #endif + /** * @} Index: uspace/drv/bus/usb/ohci/hw_struct/iso_transfer_descriptor.h =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/iso_transfer_descriptor.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/hw_struct/iso_transfer_descriptor.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbohci * @{ @@ -32,4 +33,5 @@ * @brief OHCI driver */ + #ifndef DRV_OHCI_HW_STRUCT_ISO_TRANSFER_DESCRIPTOR_H #define DRV_OHCI_HW_STRUCT_ISO_TRANSFER_DESCRIPTOR_H @@ -68,5 +70,7 @@ } __attribute__((packed)) itd_t; + #endif + /** * @} Index: uspace/drv/bus/usb/ohci/hw_struct/mem_access.h =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/mem_access.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/hw_struct/mem_access.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbohci * @{ @@ -32,4 +33,5 @@ * @brief OHCI driver */ + #ifndef DRV_OHCI_HW_MEM_ACCESS_H #define DRV_OHCI_HW_MEM_ACCESS_H Index: uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbohci * @{ Index: uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbohci * @{ @@ -32,4 +33,5 @@ * @brief OHCI driver */ + #ifndef DRV_OHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H #define DRV_OHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H @@ -139,5 +141,7 @@ return OHCI_MEM32_RD(instance->be) - OHCI_MEM32_RD(instance->cbp) + 1; } + #endif + /** * @} Index: uspace/drv/bus/usb/ohci/main.c =================================================================== --- uspace/drv/bus/usb/ohci/main.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/main.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -27,4 +27,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbohci * @{ @@ -128,4 +129,5 @@ return ddf_driver_main(&ohci_driver); } + /** * @} Index: uspace/drv/bus/usb/ohci/ohci_batch.c =================================================================== --- uspace/drv/bus/usb/ohci/ohci_batch.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/ohci_batch.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbohci * @{ Index: uspace/drv/bus/usb/ohci/ohci_endpoint.c =================================================================== --- uspace/drv/bus/usb/ohci/ohci_endpoint.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/ohci_endpoint.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbohci * @{ @@ -117,4 +118,5 @@ } } + /** * @} Index: uspace/drv/bus/usb/ohci/ohci_regs.h =================================================================== --- uspace/drv/bus/usb/ohci/ohci_regs.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/ohci/ohci_regs.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbohci * @{ @@ -32,6 +33,8 @@ * @brief OHCI host controller register structure */ + #ifndef DRV_OHCI_OHCI_REGS_H #define DRV_OHCI_OHCI_REGS_H + #include #include @@ -246,5 +249,7 @@ #define RHPS_CHANGE_WC_MASK (0x1f0000) } ohci_regs_t; + #endif + /** * @} Index: uspace/drv/bus/usb/uhci/hc.c =================================================================== --- uspace/drv/bus/usb/uhci/hc.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/uhci/hc.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbuhcihc * @{ Index: uspace/drv/bus/usb/uhci/hc.h =================================================================== --- uspace/drv/bus/usb/uhci/hc.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/uhci/hc.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -33,4 +33,5 @@ * @brief UHCI host controller driver structure */ + #ifndef DRV_UHCI_HC_H #define DRV_UHCI_HC_H @@ -123,12 +124,12 @@ } hc_t; -int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interupts); -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 *); -int uhci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res); +extern int uhci_hc_gen_irq_code(irq_code_t *, const hw_res_list_parsed_t *); -void uhci_hc_interrupt(hcd_t *hcd, uint32_t status); -int uhci_hc_status(hcd_t *hcd, uint32_t *status); -int uhci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch); +extern void uhci_hc_interrupt(hcd_t *, uint32_t); +extern int uhci_hc_status(hcd_t *, uint32_t *); +extern int uhci_hc_schedule(hcd_t *, usb_transfer_batch_t *); #endif Index: uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h =================================================================== --- uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbuhcihc * @{ @@ -32,4 +33,5 @@ * @brief UHCI driver */ + #ifndef DRV_UHCI_HW_STRUCT_LINK_POINTER_H #define DRV_UHCI_HW_STRUCT_LINK_POINTER_H @@ -58,4 +60,5 @@ #endif + /** * @} Index: uspace/drv/bus/usb/uhci/hw_struct/queue_head.h =================================================================== --- uspace/drv/bus/usb/uhci/hw_struct/queue_head.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/uhci/hw_struct/queue_head.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbuhcihc * @{ @@ -32,4 +33,5 @@ * @brief UHCI driver */ + #ifndef DRV_UHCI_HW_STRUCT_QH_H #define DRV_UHCI_HW_STRUCT_QH_H @@ -103,5 +105,7 @@ } } + #endif + /** * @} Index: uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c =================================================================== --- uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbuhcihc * @{ Index: uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h =================================================================== --- uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbuhcihc * @{ @@ -32,4 +33,5 @@ * @brief UHCI driver */ + #ifndef DRV_UHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H #define DRV_UHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H @@ -165,4 +167,5 @@ #endif + /** * @} Index: uspace/drv/bus/usb/uhci/main.c =================================================================== --- uspace/drv/bus/usb/uhci/main.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/uhci/main.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbuhci * @{ Index: uspace/drv/bus/usb/uhci/transfer_list.h =================================================================== --- uspace/drv/bus/usb/uhci/transfer_list.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/uhci/transfer_list.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbuhcihc * @{ @@ -32,4 +33,5 @@ * @brief UHCI driver transfer list structure */ + #ifndef DRV_UHCI_TRANSFER_LIST_H #define DRV_UHCI_TRANSFER_LIST_H @@ -61,5 +63,7 @@ void transfer_list_remove_finished(transfer_list_t *instance, list_t *done); void transfer_list_abort_all(transfer_list_t *instance); + #endif + /** * @} Index: uspace/drv/bus/usb/uhci/uhci_batch.c =================================================================== --- uspace/drv/bus/usb/uhci/uhci_batch.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/uhci/uhci_batch.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbuhcihc * @{ Index: uspace/drv/bus/usb/uhci/uhci_batch.h =================================================================== --- uspace/drv/bus/usb/uhci/uhci_batch.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/uhci/uhci_batch.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -26,4 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbuhcihc * @{ @@ -32,4 +33,5 @@ * @brief UHCI driver USB tranfer helper functions */ + #ifndef DRV_UHCI_BATCH_H #define DRV_UHCI_BATCH_H @@ -119,4 +121,5 @@ #endif + /** * @} Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.c =================================================================== --- uspace/drv/bus/usb/usbhid/mouse/mousedev.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/usbhid/mouse/mousedev.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -254,5 +254,5 @@ "will not be destroyed.\n", ddf_fun_get_name(fun)); \ } \ -} else (void)0 +} else (void) 0 /** Get highest index of a button mentioned in given report. @@ -325,5 +325,5 @@ if (hid_dev == NULL) { - usb_log_error("Failed to init keyboard structure: no structure" + usb_log_error("Failed to init mouse structure: no structure" " given.\n"); return EINVAL; Index: uspace/drv/bus/usb/usbhub/port.c =================================================================== --- uspace/drv/bus/usb/usbhub/port.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/usbhub/port.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -27,4 +27,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbhub * @{ @@ -175,5 +176,5 @@ } else { /* Handle the case we were in reset */ - //usb_hub_port_reset_fail(port); + // FIXME: usb_hub_port_reset_fail(port); /* If enabled change was reported leave the removal * to that handler, it shall ACK the change too. */ @@ -186,5 +187,5 @@ /* Enable change, ports are automatically disabled on errors. */ if (status & USB_HUB_PORT_C_STATUS_ENABLED) { - //TODO: maybe HS reset failed? + // TODO: maybe HS reset failed? usb_log_info("(%p-%u): Port disabled because of errors.\n", hub, port->port_number); Index: uspace/drv/bus/usb/usbhub/port.h =================================================================== --- uspace/drv/bus/usb/usbhub/port.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/usbhub/port.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -27,4 +27,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbhub * @{ @@ -33,4 +34,5 @@ * Hub ports related functions. */ + #ifndef DRV_USBHUB_PORT_H #define DRV_USBHUB_PORT_H @@ -45,5 +47,5 @@ typedef struct { /** Port number as reported in descriptors. */ - unsigned port_number; + unsigned int port_number; /** Device communication pipe. */ usb_pipe_t *control_pipe; @@ -69,6 +71,6 @@ * @param port Port to be initialized. */ -static inline void usb_hub_port_init(usb_hub_port_t *port, unsigned port_number, - usb_pipe_t *control_pipe) +static inline void usb_hub_port_init(usb_hub_port_t *port, + unsigned int port_number, usb_pipe_t *control_pipe) { assert(port); @@ -80,4 +82,5 @@ fibril_condvar_initialize(&port->reset_cv); } + int usb_hub_port_fini(usb_hub_port_t *port, usb_hub_dev_t *hub); int usb_hub_port_clear_feature( @@ -89,4 +92,5 @@ #endif + /** * @} Index: uspace/drv/bus/usb/usbhub/status.h =================================================================== --- uspace/drv/bus/usb/usbhub/status.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/usbhub/status.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -27,4 +27,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbhub * @{ @@ -114,5 +115,6 @@ } -#endif /* HUB_STATUS_H */ +#endif + /** * @} Index: uspace/drv/bus/usb/usbhub/usbhub.c =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/usbhub/usbhub.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -27,4 +27,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbhub * @{ @@ -56,4 +57,5 @@ #define HUB_FNC_NAME "hub" + /** Hub status-change endpoint description. * @@ -229,5 +231,4 @@ uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) { -// usb_log_debug("hub_port_changes_callback\n"); usb_hub_dev_t *hub = arg; assert(hub); @@ -314,5 +315,5 @@ hub_dev->per_port_power ? "per port" : "ganged"); - for (unsigned port = 0; port < hub_dev->port_count; ++port) { + for (unsigned int port = 0; port < hub_dev->port_count; ++port) { usb_log_debug("(%p): Powering port %u.", hub_dev, port); const int ret = usb_hub_port_set_feature( Index: uspace/drv/bus/usb/usbhub/usbhub.h =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/usbhub/usbhub.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -27,4 +27,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup drvusbhub * @{ @@ -33,4 +34,5 @@ * @brief Hub driver. */ + #ifndef DRV_USBHUB_USBHUB_H #define DRV_USBHUB_USBHUB_H @@ -82,12 +84,13 @@ extern const usb_endpoint_description_t hub_status_change_endpoint_description; -int usb_hub_device_add(usb_device_t *usb_dev); -int usb_hub_device_remove(usb_device_t *usb_dev); -int usb_hub_device_gone(usb_device_t *usb_dev); +extern int usb_hub_device_add(usb_device_t *); +extern int usb_hub_device_remove(usb_device_t *); +extern int usb_hub_device_gone(usb_device_t *); -bool hub_port_changes_callback(usb_device_t *dev, - uint8_t *change_bitmap, size_t change_bitmap_size, void *arg); +extern bool hub_port_changes_callback(usb_device_t *, uint8_t *, size_t, + void *); #endif + /** * @} Index: uspace/drv/bus/usb/usbmast/bo_trans.c =================================================================== --- uspace/drv/bus/usb/usbmast/bo_trans.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/usbmast/bo_trans.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -34,4 +34,5 @@ * USB mass storage bulk-only transport. */ + #include #include Index: uspace/drv/bus/usb/usbmast/main.c =================================================================== --- uspace/drv/bus/usb/usbmast/main.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/usbmast/main.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -35,4 +35,5 @@ * Main routines of USB mass storage driver. */ + #include #include Index: uspace/drv/bus/usb/usbmast/scsi_ms.c =================================================================== --- uspace/drv/bus/usb/usbmast/scsi_ms.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/usbmast/scsi_ms.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -35,4 +35,5 @@ * SCSI functions for USB mass storage driver. */ + #include #include Index: uspace/drv/bus/usb/usbmid/explore.c =================================================================== --- uspace/drv/bus/usb/usbmid/explore.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/usbmid/explore.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -34,4 +34,5 @@ * Exploration of available interfaces in the USB device. */ + #include #include Index: uspace/drv/bus/usb/usbmid/usbmid.c =================================================================== --- uspace/drv/bus/usb/usbmid/usbmid.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/usbmid/usbmid.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -35,4 +35,5 @@ * Helper functions. */ + #include #include Index: uspace/drv/bus/usb/usbmid/usbmid.h =================================================================== --- uspace/drv/bus/usb/usbmid/usbmid.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/usbmid/usbmid.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -62,10 +62,10 @@ } usb_mid_t; -int usbmid_explore_device(usb_device_t *); -int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **, +extern int usbmid_explore_device(usb_device_t *); +extern int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **, const usb_standard_device_descriptor_t *, const usb_standard_interface_descriptor_t *); -void usbmid_dump_descriptors(uint8_t *, size_t); -int usbmid_interface_destroy(usbmid_interface_t *mid_iface); +extern void usbmid_dump_descriptors(uint8_t *, size_t); +extern int usbmid_interface_destroy(usbmid_interface_t *mid_iface); static inline usbmid_interface_t * usbmid_interface_from_link(link_t *item) @@ -75,4 +75,5 @@ #endif + /** * @} Index: uspace/drv/bus/usb/vhc/devconn.c =================================================================== --- uspace/drv/bus/usb/vhc/devconn.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/vhc/devconn.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -95,5 +95,6 @@ } -int vhc_virtdev_plug_hub(vhc_data_t *vhc, usbvirt_device_t *dev, uintptr_t *handle, usb_address_t address) +int vhc_virtdev_plug_hub(vhc_data_t *vhc, usbvirt_device_t *dev, + uintptr_t *handle, usb_address_t address) { return vhc_virtdev_plug_generic(vhc, NULL, dev, handle, false, address); Index: uspace/drv/bus/usb/vhc/hub/virthub.c =================================================================== --- uspace/drv/bus/usb/vhc/hub/virthub.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/vhc/hub/virthub.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -33,4 +33,5 @@ * @brief */ + #include #include Index: uspace/drv/bus/usb/vhc/hub/virthub.h =================================================================== --- uspace/drv/bus/usb/vhc/hub/virthub.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/vhc/hub/virthub.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -33,4 +33,5 @@ * @brief USB hub as a virtual USB device. */ + #ifndef VHC_HUB_VIRTHUB_H_ #define VHC_HUB_VIRTHUB_H_ @@ -86,4 +87,5 @@ #endif + /** * @} Index: uspace/drv/bus/usb/vhc/hub/virthubops.c =================================================================== --- uspace/drv/bus/usb/vhc/hub/virthubops.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/vhc/hub/virthubops.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -33,4 +33,5 @@ * @brief Virtual USB hub operations. */ + #include #include Index: uspace/drv/bus/usb/vhc/main.c =================================================================== --- uspace/drv/bus/usb/vhc/main.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/vhc/main.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -43,5 +43,4 @@ #include #include "vhcd.h" - static ddf_dev_ops_t vhc_ops = { Index: uspace/drv/bus/usb/vhc/transfer.c =================================================================== --- uspace/drv/bus/usb/vhc/transfer.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/vhc/transfer.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -233,6 +233,6 @@ if (rc == EOK) { if (is_set_address_transfer(transfer)) { - usb_device_request_setup_packet_t *setup - = (void*)transfer->batch->setup_buffer; + usb_device_request_setup_packet_t *setup = + (void*) transfer->batch->setup_buffer; dev->address = setup->value; usb_log_debug2("Address changed to %d\n", Index: uspace/drv/bus/usb/vhc/vhcd.h =================================================================== --- uspace/drv/bus/usb/vhc/vhcd.h (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/bus/usb/vhc/vhcd.h (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -33,4 +33,5 @@ * @brief Virtual USB host controller common definitions. */ + #ifndef VHCD_VHCD_H_ #define VHCD_VHCD_H_ @@ -41,5 +42,4 @@ #include - #define NAME "vhc" @@ -67,5 +67,4 @@ } vhc_transfer_t; - void on_client_close(ddf_fun_t *fun); void default_connection_handler(ddf_fun_t *fun, ipc_callid_t icallid, @@ -82,4 +81,5 @@ #endif + /** * @} Index: uspace/drv/nic/ar9271/ath_usb.c =================================================================== --- uspace/drv/nic/ar9271/ath_usb.c (revision b4b534ac1d1515633baff0d563e9c16938bfe19f) +++ uspace/drv/nic/ar9271/ath_usb.c (revision 10cb47eaa0c19e8c686b3c5e3d3e6084e07b901c) @@ -100,5 +100,5 @@ usb_pipe_t *pipe = &usb_device_get_mapped_ep( ath_usb->usb_device, ath_usb->output_ctrl_pipe_number)->pipe; - + return usb_pipe_write(pipe, buffer, buffer_size); } @@ -120,5 +120,5 @@ usb_pipe_t *pipe = &usb_device_get_mapped_ep( ath_usb->usb_device, ath_usb->input_ctrl_pipe_number)->pipe; - + return usb_pipe_read(pipe, buffer, buffer_size, transferred_size); } @@ -141,19 +141,19 @@ memcpy(complete_buffer + sizeof(ath_usb_data_header_t), buffer, buffer_size); - + ath_usb_data_header_t *data_header = (ath_usb_data_header_t *) complete_buffer; data_header->length = host2uint16_t_le(buffer_size); data_header->tag = host2uint16_t_le(TX_TAG); - + ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data; usb_pipe_t *pipe = &usb_device_get_mapped_ep( ath_usb->usb_device, ath_usb->output_data_pipe_number)->pipe; - + int ret_val = usb_pipe_write(pipe, complete_buffer, complete_buffer_size); - + free(complete_buffer); - + return ret_val; } @@ -175,5 +175,5 @@ usb_pipe_t *pipe = &usb_device_get_mapped_ep( ath_usb->usb_device, ath_usb->input_data_pipe_number)->pipe; - + return usb_pipe_read(pipe, buffer, buffer_size, transferred_size); }