Changeset 3dd80f8 in mainline

Timestamp:

2018-01-24T20:45:40Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

92a7b296

Parents:

4db49344

Message:

xhci: extern all the things!

Location:

uspace/drv/bus/usb/xhci

Files:

• bus.h (modified) (1 diff)
• commands.h (modified) (1 diff)
• debug.h (modified) (1 diff)
• endpoint.h (modified) (1 diff)
• hc.h (modified) (1 diff)
• isoch.h (modified) (1 diff)
• rh.h (modified) (1 diff)
• scratchpad.h (modified) (1 diff)
• streams.h (modified) (1 diff)
• transfers.h (modified) (1 diff)
• trb_ring.h (modified) (3 diffs)

uspace/drv/bus/usb/xhci/bus.h

@@ -52 +52 @@
 } xhci_bus_t;
 
-int xhci_bus_init(xhci_bus_t *, xhci_hc_t *);
-void xhci_bus_fini(xhci_bus_t *);
+extern int xhci_bus_init(xhci_bus_t *, xhci_hc_t *);
+extern void xhci_bus_fini(xhci_bus_t *);
 
 static inline xhci_bus_t *bus_to_xhci_bus(bus_t *bus_base)

uspace/drv/bus/usb/xhci/commands.h

@@ -125 +125 @@
 
 /* Command handling control */
-int xhci_init_commands(xhci_hc_t *);
-void xhci_fini_commands(xhci_hc_t *);
+extern int xhci_init_commands(xhci_hc_t *);
+extern void xhci_fini_commands(xhci_hc_t *);
 
-void xhci_stop_command_ring(xhci_hc_t *);
-void xhci_abort_command_ring(xhci_hc_t *);
-void xhci_start_command_ring(xhci_hc_t *);
+extern void xhci_stop_command_ring(xhci_hc_t *);
+extern void xhci_abort_command_ring(xhci_hc_t *);
+extern void xhci_start_command_ring(xhci_hc_t *);
 
-int xhci_handle_command_completion(xhci_hc_t *, xhci_trb_t *);
+extern int xhci_handle_command_completion(xhci_hc_t *, xhci_trb_t *);
 
 /* Command lifecycle */
-void xhci_cmd_init(xhci_cmd_t *, xhci_cmd_type_t);
-void xhci_cmd_fini(xhci_cmd_t *);
+extern void xhci_cmd_init(xhci_cmd_t *, xhci_cmd_type_t);
+extern void xhci_cmd_fini(xhci_cmd_t *);
 
 /* Issuing commands */
-int xhci_cmd_sync(xhci_hc_t *, xhci_cmd_t *);
-int xhci_cmd_sync_fini(xhci_hc_t *, xhci_cmd_t *);
-int xhci_cmd_async_fini(xhci_hc_t *, xhci_cmd_t *);
+extern int xhci_cmd_sync(xhci_hc_t *, xhci_cmd_t *);
+extern int xhci_cmd_sync_fini(xhci_hc_t *, xhci_cmd_t *);
+extern int xhci_cmd_async_fini(xhci_hc_t *, xhci_cmd_t *);
 
 static inline int xhci_cmd_sync_inline_wrapper(xhci_hc_t *hc, xhci_cmd_t cmd)

uspace/drv/bus/usb/xhci/debug.h

@@ -50 +50 @@
 struct xhci_input_ctx;
 
-void xhci_dump_cap_regs(const struct xhci_cap_regs *);
-void xhci_dump_port(const struct xhci_port_regs *);
-void xhci_dump_state(const struct xhci_hc *);
-void xhci_dump_ports(const struct xhci_hc *);
+extern void xhci_dump_cap_regs(const struct xhci_cap_regs *);
+extern void xhci_dump_port(const struct xhci_port_regs *);
+extern void xhci_dump_state(const struct xhci_hc *);
+extern void xhci_dump_ports(const struct xhci_hc *);
 
-const char *xhci_trb_str_type(unsigned);
-void xhci_dump_trb(const struct xhci_trb *trb);
+extern const char *xhci_trb_str_type(unsigned);
+extern void xhci_dump_trb(const struct xhci_trb *trb);
 
-const char *xhci_ec_str_id(unsigned);
-void xhci_dump_extcap(const struct xhci_extcap *);
+extern const char *xhci_ec_str_id(unsigned);
+extern void xhci_dump_extcap(const struct xhci_extcap *);
 
-void xhci_dump_slot_ctx(const struct xhci_slot_ctx *);
-void xhci_dump_endpoint_ctx(const struct xhci_endpoint_ctx *);
-void xhci_dump_input_ctx(const struct xhci_hc *, const struct xhci_input_ctx *);
+extern void xhci_dump_slot_ctx(const struct xhci_slot_ctx *);
+extern void xhci_dump_endpoint_ctx(const struct xhci_endpoint_ctx *);
+extern void xhci_dump_input_ctx(const struct xhci_hc *, const struct xhci_input_ctx *);
 
 #endif

uspace/drv/bus/usb/xhci/endpoint.h

@@ -109 +109 @@
         (usb_str_transfer_type((ep).base.transfer_type))
 
-int xhci_endpoint_type(xhci_endpoint_t *ep);
+extern int xhci_endpoint_type(xhci_endpoint_t *ep);
 
-endpoint_t *xhci_endpoint_create(device_t *, const usb_endpoint_descriptors_t *);
-int xhci_endpoint_register(endpoint_t *);
-void xhci_endpoint_unregister(endpoint_t *);
-void xhci_endpoint_destroy(endpoint_t *);
+extern endpoint_t *xhci_endpoint_create(device_t *, const usb_endpoint_descriptors_t *);
+extern int xhci_endpoint_register(endpoint_t *);
+extern void xhci_endpoint_unregister(endpoint_t *);
+extern void xhci_endpoint_destroy(endpoint_t *);
 
-void xhci_endpoint_free_transfer_ds(xhci_endpoint_t *);
-xhci_trb_ring_t *xhci_endpoint_get_ring(xhci_endpoint_t *, uint32_t);
+extern void xhci_endpoint_free_transfer_ds(xhci_endpoint_t *);
+extern xhci_trb_ring_t *xhci_endpoint_get_ring(xhci_endpoint_t *, uint32_t);
 
-void xhci_setup_endpoint_context(xhci_endpoint_t *, xhci_ep_ctx_t *);
-int xhci_endpoint_clear_halt(xhci_endpoint_t *, unsigned);
+extern void xhci_setup_endpoint_context(xhci_endpoint_t *, xhci_ep_ctx_t *);
+extern int xhci_endpoint_clear_halt(xhci_endpoint_t *, unsigned);
 
 static inline xhci_endpoint_t * xhci_endpoint_get(endpoint_t *ep)

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

@@ -114 +114 @@
 typedef struct xhci_device xhci_device_t;
 
-int hc_init_mmio(xhci_hc_t *, const hw_res_list_parsed_t *);
-int hc_init_memory(xhci_hc_t *, ddf_dev_t *);
-int hc_claim(xhci_hc_t *, ddf_dev_t *);
-int hc_irq_code_gen(irq_code_t *, xhci_hc_t *, const hw_res_list_parsed_t *);
-int hc_start(xhci_hc_t *, bool);
-void hc_fini(xhci_hc_t *);
+extern int hc_init_mmio(xhci_hc_t *, const hw_res_list_parsed_t *);
+extern int hc_init_memory(xhci_hc_t *, ddf_dev_t *);
+extern int hc_claim(xhci_hc_t *, ddf_dev_t *);
+extern int hc_irq_code_gen(irq_code_t *, xhci_hc_t *, const hw_res_list_parsed_t *);
+extern int hc_start(xhci_hc_t *, bool);
+extern void hc_fini(xhci_hc_t *);
 
-void hc_ring_doorbell(xhci_hc_t *, unsigned, unsigned);
-void hc_ring_ep_doorbell(xhci_endpoint_t *, uint32_t);
-unsigned hc_speed_to_psiv(usb_speed_t);
+extern void hc_ring_doorbell(xhci_hc_t *, unsigned, unsigned);
+extern void hc_ring_ep_doorbell(xhci_endpoint_t *, uint32_t);
+extern unsigned hc_speed_to_psiv(usb_speed_t);
 
-int hc_enable_slot(xhci_device_t *);
-int hc_disable_slot(xhci_device_t *);
-int hc_address_device(xhci_device_t *);
-int hc_configure_device(xhci_device_t *);
-int hc_deconfigure_device(xhci_device_t *);
-int hc_add_endpoint(xhci_endpoint_t *);
-int hc_drop_endpoint(xhci_endpoint_t *);
-int hc_update_endpoint(xhci_endpoint_t *);
-int hc_stop_endpoint(xhci_endpoint_t *);
-int hc_reset_endpoint(xhci_endpoint_t *);
-int hc_reset_ring(xhci_endpoint_t *, uint32_t);
+extern int hc_enable_slot(xhci_device_t *);
+extern int hc_disable_slot(xhci_device_t *);
+extern int hc_address_device(xhci_device_t *);
+extern int hc_configure_device(xhci_device_t *);
+extern int hc_deconfigure_device(xhci_device_t *);
+extern int hc_add_endpoint(xhci_endpoint_t *);
+extern int hc_drop_endpoint(xhci_endpoint_t *);
+extern int hc_update_endpoint(xhci_endpoint_t *);
+extern int hc_stop_endpoint(xhci_endpoint_t *);
+extern int hc_reset_endpoint(xhci_endpoint_t *);
+extern int hc_reset_ring(xhci_endpoint_t *, uint32_t);
 
-int hc_status(bus_t *, uint32_t *);
-void hc_interrupt(bus_t *, uint32_t);
+extern int hc_status(bus_t *, uint32_t *);
+extern void hc_interrupt(bus_t *, uint32_t);
 
 #endif

uspace/drv/bus/usb/xhci/isoch.h

@@ -117 +117 @@
 typedef struct usb_endpoint_descriptors usb_endpoint_descriptors_t;
 
-void isoch_init(xhci_endpoint_t *, const usb_endpoint_descriptors_t *);
-void isoch_fini(xhci_endpoint_t *);
-int isoch_alloc_transfers(xhci_endpoint_t *);
+extern void isoch_init(xhci_endpoint_t *, const usb_endpoint_descriptors_t *);
+extern void isoch_fini(xhci_endpoint_t *);
+extern int isoch_alloc_transfers(xhci_endpoint_t *);
 
-int isoch_schedule_out(xhci_transfer_t *);
-int isoch_schedule_in(xhci_transfer_t *);
-void isoch_handle_transfer_event(xhci_hc_t *, xhci_endpoint_t *, xhci_trb_t *);
+extern int isoch_schedule_out(xhci_transfer_t *);
+extern int isoch_schedule_in(xhci_transfer_t *);
+extern void isoch_handle_transfer_event(xhci_hc_t *, xhci_endpoint_t *, xhci_trb_t *);
 
 #endif

uspace/drv/bus/usb/xhci/rh.h

@@ -75 +75 @@
 } xhci_rh_t;
 
-int xhci_rh_init(xhci_rh_t *, xhci_hc_t *);
-int xhci_rh_fini(xhci_rh_t *);
+extern int xhci_rh_init(xhci_rh_t *, xhci_hc_t *);
+extern int xhci_rh_fini(xhci_rh_t *);
 
-void xhci_rh_handle_port_change(xhci_rh_t *, uint8_t);
-void xhci_rh_set_ports_protocol(xhci_rh_t *, unsigned, unsigned, unsigned);
-void xhci_rh_startup(xhci_rh_t *);
+extern void xhci_rh_handle_port_change(xhci_rh_t *, uint8_t);
+extern void xhci_rh_set_ports_protocol(xhci_rh_t *, unsigned, unsigned, unsigned);
+extern void xhci_rh_startup(xhci_rh_t *);
 
 #endif

uspace/drv/bus/usb/xhci/scratchpad.h

@@ -45 +45 @@
 typedef struct xhci_hc xhci_hc_t;
 
-int xhci_scratchpad_alloc(xhci_hc_t *);
-void xhci_scratchpad_free(xhci_hc_t *);
+extern int xhci_scratchpad_alloc(xhci_hc_t *);
+extern void xhci_scratchpad_free(xhci_hc_t *);
 
 #endif

uspace/drv/bus/usb/xhci/streams.h

@@ -61 +61 @@
 } xhci_stream_data_t;
 
-xhci_stream_data_t *xhci_get_stream_ctx_data(xhci_endpoint_t *ep, uint32_t stream_id);
-void xhci_stream_free_ds(xhci_endpoint_t *xhci_ep);
+extern xhci_stream_data_t *xhci_get_stream_ctx_data(xhci_endpoint_t *ep, uint32_t stream_id);
+extern void xhci_stream_free_ds(xhci_endpoint_t *xhci_ep);
 
-int xhci_endpoint_remove_streams(xhci_hc_t *hc, xhci_device_t *dev, xhci_endpoint_t *xhci_ep);
-int xhci_endpoint_request_primary_streams(xhci_hc_t *hc, xhci_device_t *dev,
+extern int xhci_endpoint_remove_streams(xhci_hc_t *hc, xhci_device_t *dev, xhci_endpoint_t *xhci_ep);
+extern int xhci_endpoint_request_primary_streams(xhci_hc_t *hc, xhci_device_t *dev,
         xhci_endpoint_t *xhci_ep, unsigned count);
-int xhci_endpoint_request_secondary_streams(xhci_hc_t *hc, xhci_device_t *dev,
+extern int xhci_endpoint_request_secondary_streams(xhci_hc_t *hc, xhci_device_t *dev,
         xhci_endpoint_t *xhci_ep, unsigned *sizes, unsigned count);
 

uspace/drv/bus/usb/xhci/transfers.h

@@ -55 +55 @@
 } xhci_transfer_t;
 
-usb_transfer_batch_t* xhci_transfer_create(endpoint_t *);
-int xhci_transfer_schedule(usb_transfer_batch_t *);
+extern usb_transfer_batch_t* xhci_transfer_create(endpoint_t *);
+extern int xhci_transfer_schedule(usb_transfer_batch_t *);
 
-int xhci_handle_transfer_event(xhci_hc_t *, xhci_trb_t *);
-void xhci_transfer_destroy(usb_transfer_batch_t *);
+extern int xhci_handle_transfer_event(xhci_hc_t *, xhci_trb_t *);
+extern void xhci_transfer_destroy(usb_transfer_batch_t *);
 
 static inline xhci_transfer_t *xhci_transfer_from_batch(usb_transfer_batch_t *batch)

uspace/drv/bus/usb/xhci/trb_ring.h

@@ -74 +74 @@
 } xhci_trb_ring_t;
 
-int xhci_trb_ring_init(xhci_trb_ring_t *, size_t);
-void xhci_trb_ring_fini(xhci_trb_ring_t *);
-int xhci_trb_ring_enqueue(xhci_trb_ring_t *, xhci_trb_t *, uintptr_t *);
-int xhci_trb_ring_enqueue_multiple(xhci_trb_ring_t *, xhci_trb_t *, size_t, uintptr_t *);
+extern int xhci_trb_ring_init(xhci_trb_ring_t *, size_t);
+extern void xhci_trb_ring_fini(xhci_trb_ring_t *);
+extern int xhci_trb_ring_enqueue(xhci_trb_ring_t *, xhci_trb_t *, uintptr_t *);
+extern int xhci_trb_ring_enqueue_multiple(xhci_trb_ring_t *, xhci_trb_t *, size_t, uintptr_t *);
 
-void xhci_trb_ring_reset_dequeue_state(xhci_trb_ring_t *ring, uintptr_t *addr);
+extern void xhci_trb_ring_reset_dequeue_state(xhci_trb_ring_t *ring, uintptr_t *addr);
 
 /**
@@ -107 +107 @@
 } xhci_event_ring_t;
 
-int xhci_event_ring_init(xhci_event_ring_t *, size_t);
-void xhci_event_ring_fini(xhci_event_ring_t *);
-int xhci_event_ring_dequeue(xhci_event_ring_t *, xhci_trb_t *);
+extern int xhci_event_ring_init(xhci_event_ring_t *, size_t);
+extern void xhci_event_ring_fini(xhci_event_ring_t *);
+extern int xhci_event_ring_dequeue(xhci_event_ring_t *, xhci_trb_t *);
 
 /**
@@ -124 +124 @@
 } xhci_sw_ring_t;
 
-void xhci_sw_ring_init(xhci_sw_ring_t *, size_t);
+extern void xhci_sw_ring_init(xhci_sw_ring_t *, size_t);
 
 /* Both may block if the ring is full/empty. */
-int xhci_sw_ring_enqueue(xhci_sw_ring_t *, xhci_trb_t *);
-int xhci_sw_ring_dequeue(xhci_sw_ring_t *, xhci_trb_t *);
+extern int xhci_sw_ring_enqueue(xhci_sw_ring_t *, xhci_trb_t *);
+extern int xhci_sw_ring_dequeue(xhci_sw_ring_t *, xhci_trb_t *);
 
-void xhci_sw_ring_stop(xhci_sw_ring_t *);
-void xhci_sw_ring_fini(xhci_sw_ring_t *);
+extern void xhci_sw_ring_stop(xhci_sw_ring_t *);
+extern void xhci_sw_ring_fini(xhci_sw_ring_t *);
 
 #endif