Changes in / [6265a2b:7fc092a] in mainline
- Location:
- uspace
- Files:
-
- 20 added
- 1 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/bdsh/cmds/modules/cat/cat.c
r6265a2b r7fc092a 144 144 return CMD_SUCCESS; 145 145 case 'H': 146 printf( cat_oops);146 printf("%s", cat_oops); 147 147 return CMD_FAILURE; 148 148 case 't': 149 printf( cat_oops);149 printf("%s", cat_oops); 150 150 return CMD_FAILURE; 151 151 case 'b': 152 printf( cat_oops);152 printf("%s", cat_oops); 153 153 break; 154 154 case 'm': 155 printf( cat_oops);155 printf("%s", cat_oops); 156 156 return CMD_FAILURE; 157 157 } -
uspace/app/bdsh/cmds/modules/rm/rm.c
r6265a2b r7fc092a 227 227 } 228 228 memset(buff, 0, sizeof(buff)); 229 snprintf(buff, len, argv[i]);229 snprintf(buff, len, "%s", argv[i]); 230 230 231 231 scope = rm_scope(buff); -
uspace/drv/rootvirt/devices.def
r6265a2b r7fc092a 23 23 #endif 24 24 /* Virtual USB host controller. */ 25 /* 25 26 { 26 27 .name = "usbhc", 27 28 .match_id = "usb&hc=vhc" 28 29 }, 30 */ -
uspace/drv/uhci/Makefile
r6265a2b r7fc092a 29 29 USPACE_PREFIX = ../.. 30 30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a 31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include 31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include -I. 32 32 BINARY = uhci 33 33 34 34 SOURCES = \ 35 callback.c \ 36 iface.c \ 35 37 main.c \ 36 transfers.c 38 root_hub/port.c \ 39 root_hub/port_status.c \ 40 root_hub/root_hub.c \ 41 transfer_list.c \ 42 uhci.c 37 43 38 44 include $(USPACE_PREFIX)/Makefile.common -
uspace/drv/uhci/main.c
r6265a2b r7fc092a 1 1 /* 2 * Copyright (c) 2010 Vojtech Horky 2 * Copyright (c) 2010 Vojtech Horky, Jan Vesely 3 3 * All rights reserved. 4 4 * … … 28 28 #include <usb/hcdhubd.h> 29 29 #include <usb_iface.h> 30 #include <usb/debug.h>31 30 #include <errno.h> 32 #include <driver.h> 31 32 #include "debug.h" 33 #include "iface.h" 34 #include "name.h" 33 35 #include "uhci.h" 34 36 … … 53 55 static int uhci_add_device(device_t *device) 54 56 { 55 u sb_dprintf(NAME, 1, "uhci_add_device() called\n");57 uhci_print_info( "uhci_add_device() called\n" ); 56 58 device->ops = &uhci_ops; 57 59 58 /* 59 * We need to announce the presence of our root hub. 60 */ 61 usb_dprintf(NAME, 2, "adding root hub\n"); 62 usb_hcd_add_root_hub(device); 60 // TODO: get this value out of pci driver 61 uhci_init(device, (void*)0xc020); 63 62 64 63 return EOK; … … 80 79 */ 81 80 sleep(5); 82 usb_dprintf_enable(NAME, 5);81 usb_dprintf_enable(NAME, DEBUG_LEVEL_MAX); 83 82 84 83 return driver_main(&uhci_driver); -
uspace/drv/uhci/uhci.h
r6265a2b r7fc092a 1 1 /* 2 * Copyright (c) 2010 Vojtech Horky2 * Copyright (c) 2010 Jan Vesely 3 3 * All rights reserved. 4 4 * … … 26 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 27 */ 28 29 28 /** @addtogroup usb 30 29 * @{ … … 36 35 #define DRV_UHCI_UHCI_H 37 36 37 #include <fibril.h> 38 39 #include <usb/addrkeep.h> 40 #include <usb/hcdhubd.h> 38 41 #include <usbhc_iface.h> 39 42 40 #define NAME "uhci" 43 #include "root_hub/root_hub.h" 44 #include "transfer_list.h" 41 45 42 usbhc_iface_t uhci_iface; 46 typedef struct uhci_regs { 47 uint16_t usbcmd; 48 uint16_t usbsts; 49 uint16_t usbintr; 50 uint16_t frnum; 51 uint32_t flbaseadd; 52 uint8_t sofmod; 53 } regs_t; 54 55 #define TRANSFER_QUEUES 4 56 #define UHCI_FRAME_LIST_COUNT 1024 57 58 typedef struct uhci { 59 usb_address_keeping_t address_manager; 60 uhci_root_hub_t root_hub; 61 volatile regs_t *registers; 62 63 link_pointer_t *frame_list; 64 65 transfer_list_t transfers[TRANSFER_QUEUES]; 66 fid_t cleaner; 67 } uhci_t; 68 69 /* init uhci specifics in device.driver_data */ 70 int uhci_init( device_t *device, void *regs ); 71 72 int uhci_destroy( device_t *device ); 73 74 int uhci_in( 75 device_t *dev, 76 usb_target_t target, 77 usb_transfer_type_t transfer_type, 78 void *buffer, size_t size, 79 usbhc_iface_transfer_in_callback_t callback, void *arg 80 ); 81 82 int uhci_out( 83 device_t *dev, 84 usb_target_t target, 85 usb_transfer_type_t transfer_type, 86 void *buffer, size_t size, 87 usbhc_iface_transfer_out_callback_t callback, void *arg 88 ); 89 90 int uhci_setup( 91 device_t *dev, 92 usb_target_t target, 93 usb_transfer_type_t transfer_type, 94 void *buffer, size_t size, 95 usbhc_iface_transfer_out_callback_t callback, void *arg 96 ); 43 97 44 98 #endif -
uspace/lib/usb/include/usb/devreq.h
r6265a2b r7fc092a 70 70 /** Main parameter to the request. */ 71 71 union { 72 uint16_t value; 72 73 /* FIXME: add #ifdefs according to host endianess */ 73 74 struct { … … 75 76 uint8_t value_high; 76 77 }; 77 uint16_t value;78 78 }; 79 79 /** Auxiliary parameter to the request. -
uspace/lib/usb/src/addrkeep.c
r6265a2b r7fc092a 33 33 * @brief Address keeping. 34 34 */ 35 #include <usb/ hcd.h>35 #include <usb/addrkeep.h> 36 36 #include <errno.h> 37 37 #include <assert.h>
Note:
See TracChangeset
for help on using the changeset viewer.