Changes in / [1e64b250:4e38d69] in mainline
- Location:
- uspace/drv
- Files:
-
- 2 added
- 2 deleted
- 12 edited
-
uhci-hcd/Makefile (modified) (2 diffs)
-
uhci-hcd/callback.c (deleted)
-
uhci-hcd/callback.h (deleted)
-
uhci-hcd/iface.c (modified) (9 diffs)
-
uhci-hcd/tracker.c (added)
-
uhci-hcd/tracker.h (added)
-
uhci-hcd/transfer_list.c (modified) (2 diffs)
-
uhci-hcd/transfer_list.h (modified) (2 diffs)
-
uhci-hcd/uhci.c (modified) (7 diffs)
-
uhci-hcd/uhci.h (modified) (5 diffs)
-
uhci-hcd/uhci_struct/queue_head.h (modified) (1 diff)
-
uhci-hcd/uhci_struct/transfer_descriptor.c (modified) (3 diffs)
-
uhci-hcd/uhci_struct/transfer_descriptor.h (modified) (2 diffs)
-
uhci-rhd/main.c (modified) (1 diff)
-
usbhid/hid.h (modified) (1 diff)
-
usbhid/main.c (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/uhci-hcd/Makefile
r1e64b250 r4e38d69 33 33 34 34 SOURCES = \ 35 callback.c \36 35 iface.c \ 37 36 main.c \ … … 40 39 uhci.c \ 41 40 uhci_struct/transfer_descriptor.c \ 42 pci.c 41 pci.c \ 42 tracker.c 43 43 44 44 include $(USPACE_PREFIX)/Makefile.common -
uspace/drv/uhci-hcd/iface.c
r1e64b250 r4e38d69 106 106 usbhc_iface_transfer_out_callback_t callback, void *arg) 107 107 { 108 assert(dev); 109 uhci_t *hc = dev_to_uhci(dev); 110 assert(hc); 111 return uhci_transfer(hc, dev, target, USB_TRANSFER_INTERRUPT, 0, USB_PID_OUT, 112 false, data, size, callback, NULL, arg); 108 size_t max_packet_size = 8; 109 dev_speed_t speed = FULL_SPEED; 110 111 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_INTERRUPT, 112 max_packet_size, speed, data, size, NULL, callback, arg); 113 if (!tracker) 114 return ENOMEM; 115 tracker_interrupt_out(tracker); 116 return EOK; 113 117 } 114 118 /*----------------------------------------------------------------------------*/ … … 117 121 usbhc_iface_transfer_in_callback_t callback, void *arg) 118 122 { 119 assert(dev); 120 uhci_t *hc = dev_to_uhci(dev); 121 assert(hc); 122 return uhci_transfer(hc, dev, target, USB_TRANSFER_INTERRUPT, 0, USB_PID_IN, 123 false, data, size, NULL, callback, arg); 123 size_t max_packet_size = 4; 124 dev_speed_t speed = FULL_SPEED; 125 126 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_INTERRUPT, 127 max_packet_size, speed, data, size, callback, NULL, arg); 128 if (!tracker) 129 return ENOMEM; 130 tracker_interrupt_in(tracker); 131 return EOK; 132 } 133 /*----------------------------------------------------------------------------*/ 134 static int control_write(device_t *dev, usb_target_t target, 135 void *setup_data, size_t setup_size, void *data, size_t size, 136 usbhc_iface_transfer_out_callback_t callback, void *arg) 137 { 138 size_t max_packet_size = 8; 139 dev_speed_t speed = FULL_SPEED; 140 141 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 142 max_packet_size, speed, data, size, NULL, callback, arg); 143 if (!tracker) 144 return ENOMEM; 145 tracker_control_write(tracker, setup_data, setup_size); 146 return EOK; 147 } 148 /*----------------------------------------------------------------------------*/ 149 static int control_read(device_t *dev, usb_target_t target, 150 void *setup_data, size_t setup_size, void *data, size_t size, 151 usbhc_iface_transfer_in_callback_t callback, void *arg) 152 { 153 size_t max_packet_size = 8; 154 dev_speed_t speed = FULL_SPEED; 155 156 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 157 max_packet_size, speed, data, size, callback, NULL, arg); 158 if (!tracker) 159 return ENOMEM; 160 tracker_control_read(tracker, setup_data, setup_size); 161 return EOK; 124 162 } 125 163 /*----------------------------------------------------------------------------*/ … … 128 166 usbhc_iface_transfer_out_callback_t callback, void *arg) 129 167 { 130 assert(dev); 131 uhci_t *hc = dev_to_uhci(dev); 132 assert(hc); 133 return uhci_transfer(hc, dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_SETUP, 134 false, data, size, callback, NULL, arg); 168 usb_log_warning("Using deprecated API control write setup.\n"); 169 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 170 8, FULL_SPEED, data, size, NULL, callback, arg); 171 if (!tracker) 172 return ENOMEM; 173 tracker_control_setup_old(tracker); 174 return EOK; 135 175 } 136 176 /*----------------------------------------------------------------------------*/ … … 139 179 usbhc_iface_transfer_out_callback_t callback, void *arg) 140 180 { 141 assert(dev); 142 uhci_t *hc = dev_to_uhci(dev); 143 assert(hc); 144 return uhci_transfer(hc, dev, target, USB_TRANSFER_CONTROL, 1, USB_PID_OUT, 145 false, data, size, callback, NULL, arg); 181 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 182 size, FULL_SPEED, data, size, NULL, callback, arg); 183 if (!tracker) 184 return ENOMEM; 185 tracker_control_write_data_old(tracker); 186 return EOK; 146 187 } 147 188 /*----------------------------------------------------------------------------*/ … … 149 190 usbhc_iface_transfer_in_callback_t callback, void *arg) 150 191 { 151 assert(dev); 152 uhci_t *hc = dev_to_uhci(dev); 153 assert(hc); 154 return uhci_transfer(hc, dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_IN, 155 false, NULL, 0, NULL, callback, arg); 192 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 193 0, FULL_SPEED, NULL, 0, callback, NULL, arg); 194 if (!tracker) 195 return ENOMEM; 196 tracker_control_write_status_old(tracker); 197 return EOK; 156 198 } 157 199 /*----------------------------------------------------------------------------*/ … … 160 202 usbhc_iface_transfer_out_callback_t callback, void *arg) 161 203 { 162 assert(dev); 163 uhci_t *hc = dev_to_uhci(dev); 164 assert(hc); 165 return uhci_transfer(hc, dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_SETUP, 166 false, data, size, callback, NULL, arg); 204 usb_log_warning("Using deprecated API control read setup.\n"); 205 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 206 8, FULL_SPEED, data, size, NULL, callback, arg); 207 if (!tracker) 208 return ENOMEM; 209 tracker_control_setup_old(tracker); 210 return EOK; 167 211 } 168 212 /*----------------------------------------------------------------------------*/ … … 171 215 usbhc_iface_transfer_in_callback_t callback, void *arg) 172 216 { 173 assert(dev); 174 uhci_t *hc = dev_to_uhci(dev); 175 assert(hc); 176 return uhci_transfer(hc, dev, target, USB_TRANSFER_CONTROL, 1, USB_PID_IN, 177 false, data, size, NULL, callback, arg); 217 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 218 size, FULL_SPEED, data, size, callback, NULL, arg); 219 if (!tracker) 220 return ENOMEM; 221 tracker_control_read_data_old(tracker); 222 return EOK; 178 223 } 179 224 /*----------------------------------------------------------------------------*/ … … 181 226 usbhc_iface_transfer_out_callback_t callback, void *arg) 182 227 { 183 assert(dev);184 uhci_t *hc = dev_to_uhci(dev);185 assert(hc);186 return uhci_transfer(hc, dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_OUT,187 false, NULL, 0, callback, NULL, arg);188 } 189 190 228 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 229 0, FULL_SPEED, NULL, 0, NULL, callback, arg); 230 if (!tracker) 231 return ENOMEM; 232 tracker_control_read_status_old(tracker); 233 return EOK; 234 } 235 /*----------------------------------------------------------------------------*/ 191 236 usbhc_iface_t uhci_iface = { 192 237 .tell_address = get_address, … … 200 245 .interrupt_out = interrupt_out, 201 246 .interrupt_in = interrupt_in, 247 248 .control_read = control_read, 249 .control_write = control_write, 202 250 203 251 .control_write_setup = control_write_setup, -
uspace/drv/uhci-hcd/transfer_list.c
r1e64b250 r4e38d69 41 41 { 42 42 assert(instance); 43 instance->first = NULL;44 instance->last = NULL;45 43 instance->next = NULL; 46 44 instance->name = name; … … 66 64 } 67 65 /*----------------------------------------------------------------------------*/ 68 int transfer_list_append( 69 transfer_list_t *instance, transfer_descriptor_t *transfer) 66 void transfer_list_add_tracker(transfer_list_t *instance, tracker_t *tracker) 70 67 { 71 68 assert(instance); 72 assert(tra nsfer);69 assert(tracker); 73 70 74 uint32_t pa = (uintptr_t)addr_to_phys(tra nsfer);71 uint32_t pa = (uintptr_t)addr_to_phys(tracker->td); 75 72 assert((pa & LINK_POINTER_ADDRESS_MASK) == pa); 76 73 77 /* empty list */78 if (instance->first == NULL) {79 assert(instance->last == NULL);80 instance->first = instance->last = transfer;81 } else {82 assert(instance->last);83 instance->last->next_va = transfer;84 74 85 assert(instance->last->next & LINK_POINTER_TERMINATE_FLAG); 86 instance->last->next = (pa & LINK_POINTER_ADDRESS_MASK); 87 instance->last = transfer; 75 if (instance->queue_head->element & LINK_POINTER_TERMINATE_FLAG) { 76 usb_log_debug2("Adding td(%X:%X) to queue %s first.\n", 77 tracker->td->status, tracker->td->device, instance->name); 78 /* there is nothing scheduled */ 79 instance->last_tracker = tracker; 80 instance->queue_head->element = pa; 81 usb_log_debug2("Added td(%X:%X) to queue %s first.\n", 82 tracker->td->status, tracker->td->device, instance->name); 83 return; 88 84 } 85 usb_log_debug2("Adding td(%X:%X) to queue %s last.%p\n", 86 tracker->td->status, tracker->td->device, instance->name, 87 instance->last_tracker); 88 /* now we can be sure that last_tracker is a valid pointer */ 89 instance->last_tracker->td->next = pa; 90 instance->last_tracker = tracker; 89 91 90 assert(instance->queue_head); 92 usb_log_debug2("Added td(%X:%X) to queue %s last.\n", 93 tracker->td->status, tracker->td->device, instance->name); 94 95 /* check again, may be use atomic compare and swap */ 91 96 if (instance->queue_head->element & LINK_POINTER_TERMINATE_FLAG) { 92 instance->queue_head->element = (pa & LINK_POINTER_ADDRESS_MASK); 97 instance->queue_head->element = pa; 98 usb_log_debug2("Added td(%X:%X) to queue first2 %s.\n", 99 tracker->td->status, tracker->td->device, instance->name); 93 100 } 94 usb_log_debug("Successfully added transfer to the hc queue %s.\n",95 instance->name);96 return EOK;97 101 } 98 102 /** -
uspace/drv/uhci-hcd/transfer_list.h
r1e64b250 r4e38d69 36 36 37 37 #include "uhci_struct/queue_head.h" 38 #include " uhci_struct/transfer_descriptor.h"38 #include "tracker.h" 39 39 40 40 typedef struct transfer_list 41 41 { 42 tra nsfer_descriptor_t *first;43 transfer_descriptor_t *last; 42 tracker_t *last_tracker; 43 44 44 queue_head_t *queue_head; 45 45 uint32_t queue_head_pa; … … 58 58 } 59 59 60 int transfer_list_append( 61 transfer_list_t *instance, transfer_descriptor_t *transfer);60 61 void transfer_list_add_tracker(transfer_list_t *instance, tracker_t *tracker); 62 62 63 63 #endif -
uspace/drv/uhci-hcd/uhci.c
r1e64b250 r4e38d69 33 33 */ 34 34 #include <errno.h> 35 #include <adt/list.h> 35 36 36 37 #include <usb/debug.h> … … 42 43 static int uhci_clean_finished(void *arg); 43 44 static int uhci_debug_checker(void *arg); 45 static bool allowed_usb_packet( 46 bool low_speed, usb_transfer_type_t, size_t size); 44 47 45 48 int uhci_init(uhci_t *instance, void *regs, size_t reg_size) … … 84 87 85 88 const uintptr_t pa = (uintptr_t)addr_to_phys(instance->frame_list); 86 87 89 pio_write_32(&instance->registers->flbaseadd, (uint32_t)pa); 90 91 list_initialize(&instance->tracker_list); 92 fibril_mutex_initialize(&instance->tracker_list_mutex); 88 93 89 94 instance->cleaner = fibril_create(uhci_clean_finished, instance); … … 93 98 fibril_add_ready(instance->debug_checker); 94 99 95 /* Start the hc with large(64 b) packet FSBR */100 /* Start the hc with large(64B) packet FSBR */ 96 101 pio_write_16(&instance->registers->usbcmd, 97 102 UHCI_CMD_RUN_STOP | UHCI_CMD_MAX_PACKET); … … 147 152 } 148 153 /*----------------------------------------------------------------------------*/ 149 int uhci_transfer( 150 uhci_t *instance, 151 device_t *dev, 152 usb_target_t target, 153 usb_transfer_type_t transfer_type, 154 bool toggle, 155 usb_packet_id pid, 156 bool low_speed, 157 void *buffer, size_t size, 158 usbhc_iface_transfer_out_callback_t callback_out, 159 usbhc_iface_transfer_in_callback_t callback_in, 160 void *arg) 161 { 162 // TODO: Add support for isochronous transfers 163 if (transfer_type == USB_TRANSFER_ISOCHRONOUS) { 164 usb_log_warning("ISO transfer not supported.\n"); 154 int uhci_schedule(uhci_t *instance, tracker_t *tracker) 155 { 156 assert(instance); 157 assert(tracker); 158 const int low_speed = (tracker->speed == LOW_SPEED); 159 if (!allowed_usb_packet( 160 low_speed, tracker->transfer_type, tracker->packet_size)) { 161 usb_log_warning("Invalid USB packet specified %s SPEED %d %zu.\n", 162 low_speed ? "LOW" : "FULL" , tracker->transfer_type, 163 tracker->packet_size); 165 164 return ENOTSUP; 166 165 } 167 168 if (transfer_type == USB_TRANSFER_INTERRUPT 169 && size >= 64) { 170 usb_log_warning("Interrupt transfer too big %zu.\n", size); 171 return ENOTSUP; 172 } 173 174 if (size >= 1024) { 175 usb_log_warning("Transfer too big.\n"); 176 return ENOTSUP; 177 } 178 transfer_list_t *list = instance->transfers[low_speed][transfer_type]; 179 if (!list) { 180 usb_log_warning("UNSUPPORTED transfer %d-%d.\n", low_speed, transfer_type); 181 return ENOTSUP; 182 } 183 184 transfer_descriptor_t *td = NULL; 185 callback_t *job = NULL; 186 int ret = EOK; 187 assert(dev); 188 189 #define CHECK_RET_TRANS_FREE_JOB_TD(message) \ 190 if (ret != EOK) { \ 191 usb_log_error(message); \ 192 if (job) { \ 193 callback_dispose(job); \ 194 } \ 195 if (td) { free32(td); } \ 196 return ret; \ 197 } else (void) 0 198 199 job = callback_get(dev, buffer, size, callback_in, callback_out, arg); 200 ret = job ? EOK : ENOMEM; 201 CHECK_RET_TRANS_FREE_JOB_TD("Failed to allocate callback structure.\n"); 202 203 td = transfer_descriptor_get(3, size, false, target, pid, job->new_buffer); 204 ret = td ? EOK : ENOMEM; 205 CHECK_RET_TRANS_FREE_JOB_TD("Failed to setup transfer descriptor.\n"); 206 207 td->callback = job; 208 209 210 usb_log_debug("Appending a new transfer to queue %s.\n", list->name); 211 212 ret = transfer_list_append(list, td); 213 CHECK_RET_TRANS_FREE_JOB_TD("Failed to append transfer descriptor.\n"); 166 /* TODO: check available bandwith here */ 167 168 usb_log_debug2("Scheduler(%d) acquiring tracker list mutex.\n", 169 fibril_get_id()); 170 fibril_mutex_lock(&instance->tracker_list_mutex); 171 usb_log_debug2("Scheduler(%d) acquired tracker list mutex.\n", 172 fibril_get_id()); 173 174 transfer_list_t *list = 175 instance->transfers[low_speed][tracker->transfer_type]; 176 assert(list); 177 transfer_list_add_tracker(list, tracker); 178 list_append(&tracker->link, &instance->tracker_list); 179 180 usb_log_debug2("Scheduler(%d) releasing tracker list mutex.\n", 181 fibril_get_id()); 182 fibril_mutex_unlock(&instance->tracker_list_mutex); 183 usb_log_debug2("Scheduler(%d) released tracker list mutex.\n", 184 fibril_get_id()); 214 185 215 186 return EOK; 216 187 } 217 /*--------------------------------------------------------------------------- */188 /*----------------------------------------------------------------------------*/ 218 189 int uhci_clean_finished(void* arg) 219 190 { … … 223 194 224 195 while(1) { 225 usb_log_debug("Running cleaning fibril on: %p.\n", instance); 226 /* iterate all transfer queues */ 227 transfer_list_t *current_list = &instance->transfers_interrupt; 228 while (current_list) { 229 /* Remove inactive transfers from the top of the queue 230 * TODO: should I reach queue head or is this enough? */ 231 volatile transfer_descriptor_t * it = 232 current_list->first; 233 usb_log_debug("Running cleaning fibril on queue: %s (%s).\n", 234 current_list->name, it ? "SOMETHING" : "EMPTY"); 235 236 if (it) { 237 usb_log_debug("First in queue: %p (%x) PA:%x.\n", 238 it, it->status, addr_to_phys((void*)it) ); 239 usb_log_debug("First to send: %x\n", 240 (current_list->queue_head->element) ); 196 LIST_INITIALIZE(done_trackers); 197 /* tracker iteration */ 198 199 usb_log_debug2("Cleaner(%d) acquiring tracker list mutex.\n", 200 fibril_get_id()); 201 fibril_mutex_lock(&instance->tracker_list_mutex); 202 usb_log_debug2("Cleaner(%d) acquired tracker list mutex.\n", 203 fibril_get_id()); 204 205 link_t *current = instance->tracker_list.next; 206 while (current != &instance->tracker_list) 207 { 208 209 link_t *next = current->next; 210 tracker_t *tracker = list_get_instance(current, tracker_t, link); 211 212 assert(current == &tracker->link); 213 assert(tracker); 214 assert(tracker->next_step); 215 assert(tracker->td); 216 217 if (!transfer_descriptor_is_active(tracker->td)) { 218 usb_log_info("Found inactive tracker with status: %x:%x.\n", 219 tracker->td->status, tracker->td->device); 220 list_remove(current); 221 list_append(current, &done_trackers); 241 222 } 242 243 while (current_list->first && 244 !(current_list->first->status & TD_STATUS_ERROR_ACTIVE)) { 245 transfer_descriptor_t *transfer = current_list->first; 246 usb_log_info("Inactive transfer calling callback with status %x.\n", 247 transfer->status); 248 current_list->first = transfer->next_va; 249 transfer_descriptor_dispose(transfer); 250 } 251 if (!current_list->first) 252 current_list->last = current_list->first; 253 254 current_list = current_list->next; 223 current = next; 224 } 225 226 usb_log_debug2("Cleaner(%d) releasing tracker list mutex.\n", 227 fibril_get_id()); 228 fibril_mutex_unlock(&instance->tracker_list_mutex); 229 usb_log_debug2("Cleaner(%d) released tracker list mutex.\n", 230 fibril_get_id()); 231 232 while (!list_empty(&done_trackers)) { 233 tracker_t *tracker = list_get_instance( 234 done_trackers.next, tracker_t, link); 235 list_remove(&tracker->link); 236 tracker->next_step(tracker); 255 237 } 256 238 async_usleep(UHCI_CLEANER_TIMEOUT); … … 311 293 return 0; 312 294 } 295 /*----------------------------------------------------------------------------*/ 296 bool allowed_usb_packet( 297 bool low_speed, usb_transfer_type_t transfer, size_t size) 298 { 299 /* see USB specification chapter 5.5-5.8 for magic numbers used here */ 300 switch(transfer) { 301 case USB_TRANSFER_ISOCHRONOUS: 302 return (!low_speed && size < 1024); 303 case USB_TRANSFER_INTERRUPT: 304 return size <= (low_speed ? 8 : 64); 305 case USB_TRANSFER_CONTROL: /* device specifies its own max size */ 306 return (size <= (low_speed ? 8 : 64)); 307 case USB_TRANSFER_BULK: /* device specifies its own max size */ 308 return (!low_speed && size <= 64); 309 } 310 return false; 311 } 313 312 /** 314 313 * @} -
uspace/drv/uhci-hcd/uhci.h
r1e64b250 r4e38d69 37 37 38 38 #include <fibril.h> 39 #include <fibril_synch.h> 40 #include <adt/list.h> 39 41 40 42 #include <usb/addrkeep.h> … … 42 44 43 45 #include "transfer_list.h" 46 #include "tracker.h" 44 47 45 48 typedef struct uhci_regs { … … 68 71 } regs_t; 69 72 70 #define TRANSFER_QUEUES 471 73 #define UHCI_FRAME_LIST_COUNT 1024 72 74 #define UHCI_CLEANER_TIMEOUT 10000 73 #define UHCI_DEBUGER_TIMEOUT 500000 75 #define UHCI_DEBUGER_TIMEOUT 5000000 74 76 75 77 typedef struct uhci { … … 78 80 79 81 link_pointer_t *frame_list; 82 83 link_t tracker_list; 84 fibril_mutex_t tracker_list_mutex; 80 85 81 86 transfer_list_t transfers_bulk_full; … … 108 113 void *arg ); 109 114 115 int uhci_schedule(uhci_t *instance, tracker_t *tracker); 116 110 117 static inline uhci_t * dev_to_uhci(device_t *dev) 111 118 { return (uhci_t*)dev->driver_data; } -
uspace/drv/uhci-hcd/uhci_struct/queue_head.h
r1e64b250 r4e38d69 43 43 44 44 typedef struct queue_head { 45 link_pointer_t next_queue;46 link_pointer_t element;45 volatile link_pointer_t next_queue; 46 volatile link_pointer_t element; 47 47 } __attribute__((packed)) queue_head_t; 48 48 -
uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c
r1e64b250 r4e38d69 32 32 * @brief UHCI driver 33 33 */ 34 #include <errno.h> 34 35 #include <usb/debug.h> 35 36 36 37 #include "transfer_descriptor.h" 38 #include "utils/malloc32.h" 37 39 38 40 void transfer_descriptor_init(transfer_descriptor_t *instance, 39 int error_count, size_t size, bool isochronous, usb_target_t target,40 41 int error_count, size_t size, bool toggle, bool isochronous, 42 usb_target_t target, int pid, void *buffer) 41 43 { 42 44 assert(instance); 43 45 44 instance->next = 45 0 | LINK_POINTER_TERMINATE_FLAG; 46 instance->next = 0 | LINK_POINTER_TERMINATE_FLAG; 46 47 47 48 assert(size < 1024);49 48 instance->status = 0 50 49 | ((error_count & TD_STATUS_ERROR_COUNT_MASK) << TD_STATUS_ERROR_COUNT_POS) 51 50 | TD_STATUS_ERROR_ACTIVE; 52 51 52 assert(size < 1024); 53 53 instance->device = 0 54 54 | (((size - 1) & TD_DEVICE_MAXLEN_MASK) << TD_DEVICE_MAXLEN_POS) 55 | (toggle ? TD_DEVICE_DATA_TOGGLE_ONE_FLAG : 0) 55 56 | ((target.address & TD_DEVICE_ADDRESS_MASK) << TD_DEVICE_ADDRESS_POS) 56 57 | ((target.endpoint & TD_DEVICE_ENDPOINT_MASK) << TD_DEVICE_ENDPOINT_POS) … … 58 59 59 60 instance->buffer_ptr = 0; 60 61 instance->next_va = NULL;62 instance->callback = NULL;63 61 64 62 if (size) { … … 106 104 return USB_OUTCOME_CRCERROR; 107 105 108 assert((((status >> TD_STATUS_ERROR_POS) & TD_STATUS_ERROR_MASK)109 | TD_STATUS_ERROR_RESERVED) == TD_STATUS_ERROR_RESERVED);106 // assert((((status >> TD_STATUS_ERROR_POS) & TD_STATUS_ERROR_MASK) 107 // | TD_STATUS_ERROR_RESERVED) == TD_STATUS_ERROR_RESERVED); 110 108 return USB_OUTCOME_OK; 111 109 } 112 113 void transfer_descriptor_fini(transfer_descriptor_t *instance)110 /*----------------------------------------------------------------------------*/ 111 int transfer_descriptor_status(transfer_descriptor_t *instance) 114 112 { 115 113 assert(instance); 116 callback_run(instance->callback, 117 convert_outcome(instance->status), 118 ((instance->status >> TD_STATUS_ACTLEN_POS) + 1) & TD_STATUS_ACTLEN_MASK 119 ); 114 if (convert_outcome(instance->status)) 115 return EINVAL; //TODO: use sane error value here 116 return EOK; 120 117 } 121 118 /** -
uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h
r1e64b250 r4e38d69 38 38 #include <usb/usb.h> 39 39 40 #include "utils/malloc32.h"41 #include "callback.h"42 40 #include "link_pointer.h" 43 41 … … 86 84 volatile uint32_t buffer_ptr; 87 85 88 /* there is 16 bytes of data available here 89 * those are used to store callback pointer 90 * and next pointer. Thus, there is some free space 91 * on 32bits systems. 86 /* there is 16 bytes of data available here, according to UHCI 87 * Design guide, according to linux kernel the hardware does not care 88 * we don't use it anyway 92 89 */ 93 struct transfer_descriptor *next_va;94 callback_t *callback;95 90 } __attribute__((packed)) transfer_descriptor_t; 96 91 97 92 98 93 void transfer_descriptor_init(transfer_descriptor_t *instance, 99 int error_count, size_t size, bool isochronous, usb_target_t target,100 94 int error_count, size_t size, bool toggle, bool isochronous, 95 usb_target_t target, int pid, void *buffer); 101 96 102 static inline transfer_descriptor_t * transfer_descriptor_get( 103 int error_count, size_t size, bool isochronous, usb_target_t target, 104 int pid, void *buffer) 105 { 106 transfer_descriptor_t * instance = 107 malloc32(sizeof(transfer_descriptor_t)); 97 int transfer_descriptor_status(transfer_descriptor_t *instance); 108 98 109 if (instance) 110 transfer_descriptor_init( 111 instance, error_count, size, isochronous, target, pid, buffer); 112 return instance; 113 } 114 115 void transfer_descriptor_fini(transfer_descriptor_t *instance); 116 117 static inline void transfer_descriptor_dispose(transfer_descriptor_t *instance) 99 static inline bool transfer_descriptor_is_active( 100 transfer_descriptor_t *instance) 118 101 { 119 102 assert(instance); 120 transfer_descriptor_fini(instance); 121 free32(instance); 122 } 123 124 static inline void transfer_descriptor_append( 125 transfer_descriptor_t *instance, transfer_descriptor_t *item) 126 { 127 assert(instance); 128 instance->next_va = item; 129 instance->next = (uintptr_t)addr_to_phys( item ) & LINK_POINTER_ADDRESS_MASK; 103 return (instance->status & TD_STATUS_ERROR_ACTIVE) != 0; 130 104 } 131 105 #endif -
uspace/drv/uhci-rhd/main.c
r1e64b250 r4e38d69 102 102 int main(int argc, char *argv[]) 103 103 { 104 usb_log_enable(USB_LOG_LEVEL_ DEBUG, NAME);104 usb_log_enable(USB_LOG_LEVEL_ERROR, NAME); 105 105 return driver_main(&uhci_rh_driver); 106 106 } -
uspace/drv/usbhid/hid.h
r1e64b250 r4e38d69 69 69 device_t *device; 70 70 usb_hid_configuration_t *conf; 71 usb_address_t address;72 71 usb_hid_report_parser_t *parser; 73 72 74 73 usb_device_connection_t wire; 74 usb_endpoint_pipe_t ctrl_pipe; 75 75 usb_endpoint_pipe_t poll_pipe; 76 76 } usb_hid_dev_kbd_t; -
uspace/drv/usbhid/main.c
r1e64b250 r4e38d69 47 47 #include <usb/classes/hid.h> 48 48 #include <usb/classes/hidparser.h> 49 #include <usb/ devreq.h>49 #include <usb/request.h> 50 50 #include <usb/descriptor.h> 51 51 #include <io/console.h> … … 262 262 } 263 263 264 # if 0265 264 /* 266 265 * Kbd functions … … 281 280 282 281 // get the descriptor from the device 283 int rc = usb_drv_req_get_descriptor(kbd_dev->device->parent_phone, 284 kbd_dev->address, USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT, 285 0, i, kbd_dev->conf->interfaces[i].report_desc, length, 282 int rc = usb_request_get_descriptor(&kbd_dev->ctrl_pipe, 283 USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT, 284 i, 0, 285 kbd_dev->conf->interfaces[i].report_desc, length, 286 286 &actual_size); 287 287 … … 303 303 usb_standard_configuration_descriptor_t config_desc; 304 304 305 int rc = usb_drv_req_get_bare_configuration_descriptor( 306 kbd_dev->device->parent_phone, kbd_dev->address, 0, &config_desc); 305 int rc; 306 rc = usb_request_get_bare_configuration_descriptor(&kbd_dev->ctrl_pipe, 307 0, &config_desc); 307 308 308 309 if (rc != EOK) { … … 318 319 size_t transferred = 0; 319 320 // get full configuration descriptor 320 rc = usb_ drv_req_get_full_configuration_descriptor(321 kbd_dev->device->parent_phone, kbd_dev->address,0, descriptors,321 rc = usb_request_get_full_configuration_descriptor(&kbd_dev->ctrl_pipe, 322 0, descriptors, 322 323 config_desc.total_length, &transferred); 323 324 … … 363 364 return EOK; 364 365 } 365 #endif 366 366 367 static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev) 367 368 { 369 int rc; 370 368 371 usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)calloc(1, 369 372 sizeof(usb_hid_dev_kbd_t)); … … 376 379 kbd_dev->device = dev; 377 380 378 // get phone to my HC and save it as my parent's phone379 // TODO: maybe not a good idea if DDF will use parent_phone380 int rc = kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);381 if (rc < 0) {382 printf("Problem setting phone to HC.\n");383 goto error_leave;384 }385 386 rc = kbd_dev->address = usb_drv_get_my_address(dev->parent_phone, dev);387 if (rc < 0) {388 printf("Problem getting address of the device.\n");389 goto error_leave;390 }391 392 // doesn't matter now that we have no address393 // if (kbd_dev->address < 0) {394 // fprintf(stderr, NAME ": No device address!\n");395 // free(kbd_dev);396 // return NULL;397 // }398 399 /*400 * will need all descriptors:401 * 1) choose one configuration from configuration descriptors402 * (set it to the device)403 * 2) set endpoints from endpoint descriptors404 */405 406 407 // TODO: get descriptors, parse descriptors and save endpoints408 //usbkbd_process_descriptors(kbd_dev);409 usb_drv_req_set_configuration(410 kbd_dev->device->parent_phone, kbd_dev->address, 1);411 412 413 414 381 /* 415 382 * Initialize the backing connection to the host controller. … … 425 392 * Initialize device pipes. 426 393 */ 394 rc = usb_endpoint_pipe_initialize_default_control(&kbd_dev->ctrl_pipe, 395 &kbd_dev->wire); 396 if (rc != EOK) { 397 printf("Failed to initialize default control pipe: %s.\n", 398 str_error(rc)); 399 goto error_leave; 400 } 401 427 402 rc = usb_endpoint_pipe_initialize(&kbd_dev->poll_pipe, &kbd_dev->wire, 428 403 GUESSED_POLL_ENDPOINT, USB_TRANSFER_INTERRUPT, USB_DIRECTION_IN); … … 433 408 } 434 409 410 /* 411 * will need all descriptors: 412 * 1) choose one configuration from configuration descriptors 413 * (set it to the device) 414 * 2) set endpoints from endpoint descriptors 415 */ 416 417 // TODO: get descriptors, parse descriptors and save endpoints 418 usb_endpoint_pipe_start_session(&kbd_dev->ctrl_pipe); 419 //usb_request_set_configuration(&kbd_dev->ctrl_pipe, 1); 420 usbkbd_process_descriptors(kbd_dev); 421 usb_endpoint_pipe_end_session(&kbd_dev->ctrl_pipe); 435 422 436 423 return kbd_dev;
Note:
See TracChangeset
for help on using the changeset viewer.
