Changeset 151293d in mainline
- Timestamp:
- 2011-05-27T16:10:41Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 4166fb1, 6bbbcabe
- Parents:
- 49ce810 (diff), 567a3e2 (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. - Location:
- uspace
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/mkbd/main.c
r49ce810 r151293d 212 212 } 213 213 214 //char *devpath = argv[1];215 const char *devpath = "/hw/pci0/00:06.0/ohci-rh/usb00_a2/HID1/hid";214 char *devpath = argv[1]; 215 //const char *devpath = "/hw/pci0/00:06.0/ohci-rh/usb00_a2/HID1/hid"; 216 216 217 217 int rc; … … 297 297 } 298 298 299 async_usleep(10000 0);299 async_usleep(10000); 300 300 } 301 301 -
uspace/drv/ohci/hc.c
r49ce810 r151293d 343 343 { 344 344 assert(instance); 345 usb_log_debug("OHCI(%p) interrupt: %x.\n", instance, status);346 345 if ((status & ~I_SF) == 0) /* ignore sof status */ 347 346 return; 347 usb_log_debug2("OHCI(%p) interrupt: %x.\n", instance, status); 348 348 if (status & I_RHSC) 349 349 rh_interrupt(&instance->rh); -
uspace/drv/uhci-hcd/uhci.c
r49ce810 r151293d 61 61 } uhci_t; 62 62 63 static inline uhci_t * dev_to_uhci( ddf_dev_t *dev)63 static inline uhci_t * dev_to_uhci(const ddf_dev_t *dev) 64 64 { 65 65 assert(dev); … … 77 77 { 78 78 assert(dev); 79 uhci_t *uhci = dev->driver_data; 80 assert(uhci); 79 uhci_t *uhci = dev_to_uhci(dev); 81 80 hc_t *hc = &uhci->hc; 82 uint16_t status = IPC_GET_ARG1(*call);81 const uint16_t status = IPC_GET_ARG1(*call); 83 82 assert(hc); 84 83 hc_interrupt(hc, status); 85 84 } 85 /*----------------------------------------------------------------------------*/ 86 /** Operations supported by the HC driver */ 87 static ddf_dev_ops_t hc_ops = { 88 .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */ 89 }; 86 90 /*----------------------------------------------------------------------------*/ 87 91 /** Get address of the device identified by handle. … … 115 119 * @return Error code. 116 120 */ 117 static int usb_iface_get_hc_handle( 118 ddf_fun_t *fun, devman_handle_t *handle) 121 static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle) 119 122 { 120 123 assert(fun); … … 131 134 .get_hc_handle = usb_iface_get_hc_handle, 132 135 .get_address = usb_iface_get_address 133 };134 /*----------------------------------------------------------------------------*/135 /** Operations supported by the HC driver */136 static ddf_dev_ops_t hc_ops = {137 .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */138 136 }; 139 137 /*----------------------------------------------------------------------------*/ -
uspace/drv/usbhid/mouse/mousedev.c
r49ce810 r151293d 234 234 235 235 if (mouse_dev->mouse_phone < 0) { 236 usb_log_ error(NAME " No console phone.\n");237 return false; // ??236 usb_log_warning(NAME " No console phone.\n"); 237 return true; 238 238 } 239 239 -
uspace/lib/drv/include/remote_pci.h
r49ce810 r151293d 36 36 #define LIBDRV_REMOTE_PCI_H_ 37 37 38 remote_iface_t remote_pci_iface;38 extern remote_iface_t remote_pci_iface; 39 39 40 40 #endif -
uspace/lib/drv/include/remote_usb.h
r49ce810 r151293d 36 36 #define LIBDRV_REMOTE_USB_H_ 37 37 38 remote_iface_t remote_usb_iface;38 extern remote_iface_t remote_usb_iface; 39 39 40 40 #endif -
uspace/lib/drv/include/remote_usbhc.h
r49ce810 r151293d 36 36 #define LIBDRV_REMOTE_USBHC_H_ 37 37 38 remote_iface_t remote_usbhc_iface;38 extern remote_iface_t remote_usbhc_iface; 39 39 40 40 #endif
Note:
See TracChangeset
for help on using the changeset viewer.