Changes in uspace/drv/bus/usb/uhci/hc.c [ad5f149:7de1988c] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/uhci/hc.c
rad5f149 r7de1988c 32 32 * @brief UHCI Host controller driver routines 33 33 */ 34 34 #include <errno.h> 35 #include <str_error.h> 35 36 #include <adt/list.h> 36 #include <assert.h>37 #include <async.h>38 37 #include <ddi.h> 39 #include <device/hw_res_parsed.h>40 #include <fibril.h>41 #include <errno.h>42 #include <macros.h>43 #include <mem.h>44 #include <stdlib.h>45 #include <str_error.h>46 #include <sys/types.h>47 38 48 39 #include <usb/debug.h> 49 40 #include <usb/usb.h> 50 41 42 #include "hc.h" 51 43 #include "uhci_batch.h" 52 #include "utils/malloc32.h"53 #include "hc.h"54 44 55 45 #define UHCI_INTR_ALLOW_INTERRUPTS \ … … 95 85 static int hc_init_mem_structures(hc_t *instance); 96 86 static int hc_init_transfer_lists(hc_t *instance); 87 static int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch); 97 88 98 89 static int hc_interrupt_emulator(void *arg); 99 90 static int hc_debug_checker(void *arg); 100 91 92 enum { 93 /** Number of PIO ranges used in IRQ code */ 94 hc_irq_pio_range_count = 95 sizeof(uhci_irq_pio_ranges) / sizeof(irq_pio_range_t), 96 97 /* Number of commands used in IRQ code */ 98 hc_irq_cmd_count = 99 sizeof(uhci_irq_commands) / sizeof(irq_cmd_t) 100 }; 101 101 102 102 /** Generate IRQ code. 103 * @param[out] code IRQ code structure. 103 * @param[out] ranges PIO ranges buffer. 104 * @param[in] ranges_size Size of the ranges buffer (bytes). 105 * @param[out] cmds Commands buffer. 106 * @param[in] cmds_size Size of the commands buffer (bytes). 104 107 * @param[in] regs Device's register range. 105 108 * 106 109 * @return Error code. 107 110 */ 108 int hc_gen_irq_code(irq_code_t *code, addr_range_t *regs) 109 { 110 assert(code); 111 112 if (RNGSZ(*regs) < sizeof(uhci_regs_t)) 111 int 112 hc_get_irq_code(irq_pio_range_t ranges[], size_t ranges_size, irq_cmd_t cmds[], 113 size_t cmds_size, addr_range_t *regs) 114 { 115 if ((ranges_size < sizeof(uhci_irq_pio_ranges)) || 116 (cmds_size < sizeof(uhci_irq_commands)) || 117 (RNGSZ(*regs) < sizeof(uhci_regs_t))) 113 118 return EOVERFLOW; 114 119 115 code->ranges = malloc(sizeof(uhci_irq_pio_ranges)); 116 if (code->ranges == NULL) 117 return ENOMEM; 118 119 code->cmds = malloc(sizeof(uhci_irq_commands)); 120 if (code->cmds == NULL) { 121 free(code->ranges); 122 return ENOMEM; 123 } 124 125 code->rangecount = ARRAY_SIZE(uhci_irq_pio_ranges); 126 code->cmdcount = ARRAY_SIZE(uhci_irq_commands); 127 128 memcpy(code->ranges, uhci_irq_pio_ranges, sizeof(uhci_irq_pio_ranges)); 129 code->ranges[0].base = RNGABS(*regs); 130 131 memcpy(code->cmds, uhci_irq_commands, sizeof(uhci_irq_commands)); 120 memcpy(ranges, uhci_irq_pio_ranges, sizeof(uhci_irq_pio_ranges)); 121 ranges[0].base = RNGABS(*regs); 122 123 memcpy(cmds, uhci_irq_commands, sizeof(uhci_irq_commands)); 132 124 uhci_regs_t *registers = (uhci_regs_t *) RNGABSPTR(*regs); 133 code->cmds[0].addr = (void*)®isters->usbsts; 134 code->cmds[3].addr = (void*)®isters->usbsts; 125 cmds[0].addr = ®isters->usbsts; 126 cmds[3].addr = ®isters->usbsts; 127 128 return EOK; 129 } 130 131 /** Register interrupt handler. 132 * 133 * @param[in] device Host controller DDF device 134 * @param[in] regs Register range 135 * @param[in] irq Interrupt number 136 * @paran[in] handler Interrupt handler 137 * 138 * @return EOK on success or negative error code 139 */ 140 int hc_register_irq_handler(ddf_dev_t *device, addr_range_t *regs, int irq, 141 interrupt_handler_t handler) 142 { 143 int rc; 144 irq_pio_range_t irq_ranges[hc_irq_pio_range_count]; 145 irq_cmd_t irq_cmds[hc_irq_cmd_count]; 146 rc = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds, 147 sizeof(irq_cmds), regs); 148 if (rc != EOK) { 149 usb_log_error("Failed to generate IRQ commands: %s.\n", 150 str_error(rc)); 151 return rc; 152 } 153 154 irq_code_t irq_code = { 155 .rangecount = hc_irq_pio_range_count, 156 .ranges = irq_ranges, 157 .cmdcount = hc_irq_cmd_count, 158 .cmds = irq_cmds 159 }; 160 161 /* Register handler to avoid interrupt lockup */ 162 rc = register_interrupt_handler(device, irq, handler, &irq_code); 163 if (rc != EOK) { 164 usb_log_error("Failed to register interrupt handler: %s.\n", 165 str_error(rc)); 166 return rc; 167 } 135 168 136 169 return EOK; … … 162 195 &instance->transfers_bulk_full, &done); 163 196 164 list_foreach_safe(done, current, next) { 165 list_remove(current); 197 while (!list_empty(&done)) { 198 link_t *item = list_first(&done); 199 list_remove(item); 166 200 uhci_transfer_batch_t *batch = 167 uhci_transfer_batch_from_link( current);201 uhci_transfer_batch_from_link(item); 168 202 uhci_transfer_batch_finish_dispose(batch); 169 203 } … … 206 240 int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts) 207 241 { 208 assert(instance);209 assert(regs);210 242 assert(regs->size >= sizeof(uhci_regs_t)); 243 int rc; 211 244 212 245 instance->hw_interrupts = interrupts; … … 215 248 /* allow access to hc control registers */ 216 249 uhci_regs_t *io; 217 int ret= pio_enable_range(regs, (void **) &io);218 if (r et!= EOK) {250 rc = pio_enable_range(regs, (void **) &io); 251 if (rc != EOK) { 219 252 usb_log_error("Failed to gain access to registers at %p: %s.\n", 220 io, str_error(ret)); 221 return ret; 222 } 253 io, str_error(rc)); 254 return rc; 255 } 256 223 257 instance->registers = io; 224 225 258 usb_log_debug( 226 259 "Device registers at %p (%zuB) accessible.\n", io, regs->size); 227 260 228 ret = hc_init_mem_structures(instance); 229 if (ret != EOK) { 230 usb_log_error("Failed to init UHCI memory structures: %s.\n", 231 str_error(ret)); 232 // TODO: we should disable pio here 233 return ret; 234 } 261 rc = hc_init_mem_structures(instance); 262 if (rc != EOK) { 263 usb_log_error("Failed to initialize UHCI memory structures: %s.\n", 264 str_error(rc)); 265 return rc; 266 } 267 268 hcd_init(&instance->generic, USB_SPEED_FULL, 269 BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11); 270 271 instance->generic.private_data = instance; 272 instance->generic.schedule = hc_schedule; 273 instance->generic.ep_add_hook = NULL; 235 274 236 275 hc_init_hw(instance); … … 241 280 } 242 281 (void)hc_debug_checker; 243 244 uhci_rh_init(&instance->rh, instance->registers->ports, "uhci");245 282 246 283 return EOK; … … 403 440 { 404 441 assert(hcd); 405 hc_t *instance = hcd-> driver.data;442 hc_t *instance = hcd->private_data; 406 443 assert(instance); 407 444 assert(batch); 408 409 if (batch->ep->address == uhci_rh_get_address(&instance->rh))410 return uhci_rh_schedule(&instance->rh, batch);411 412 445 uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch); 413 446 if (!uhci_batch) {
Note:
See TracChangeset
for help on using the changeset viewer.