Changes in / [6eb794a:467bf40] in mainline
- Files:
-
- 96 added
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
HelenOS.config
r6eb794a r467bf40 547 547 548 548 % Launch (devman) test drivers 549 ! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS ( y/n)550 549 ! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (n/y) 550 -
Makefile
r6eb794a r467bf40 92 92 $(MAKE) -C uspace clean 93 93 $(MAKE) -C boot clean 94 95 -include Makefile.local -
boot/Makefile.common
r6eb794a r467bf40 99 99 $(USPACE_PATH)/srv/taskmon/taskmon \ 100 100 $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \ 101 $(USPACE_PATH)/srv/hw/bus/usb/hcd/virtual/vhcd \ 101 102 $(USPACE_PATH)/srv/net/netif/lo/lo \ 102 103 $(USPACE_PATH)/srv/net/il/arp/arp \ … … 143 144 $(USPACE_PATH)/app/ping/ping \ 144 145 $(USPACE_PATH)/app/stats/stats \ 146 $(USPACE_PATH)/app/sysinfo/sysinfo \ 145 147 $(USPACE_PATH)/app/tasks/tasks \ 146 148 $(USPACE_PATH)/app/top/top \ 147 $(USPACE_PATH)/app/sysinfo/sysinfo 149 $(USPACE_PATH)/app/usbinfo/usbinfo \ 150 $(USPACE_PATH)/app/virtusbkbd/vuk 148 151 149 152 ifneq ($(CONFIG_BAREBONE),y) -
boot/arch/amd64/Makefile.inc
r6eb794a r467bf40 40 40 pciintel \ 41 41 isa \ 42 ns8250 42 ns8250 \ 43 uhci \ 44 usbhub \ 45 usbkbd \ 46 vhc 43 47 44 48 RD_DRV_CFG += \ -
uspace/Makefile
r6eb794a r467bf40 49 49 app/trace \ 50 50 app/top \ 51 app/usbinfo \ 52 app/virtusbkbd \ 51 53 app/netecho \ 52 54 app/nettest1 \ … … 116 118 DIRS += drv/isa 117 119 DIRS += drv/ns8250 120 DIRS += drv/uhci 121 DIRS += drv/usbhub 122 DIRS += drv/usbkbd 123 DIRS += drv/vhc 118 124 endif 119 125 … … 123 129 DIRS += drv/isa 124 130 DIRS += drv/ns8250 131 DIRS += drv/uhci 132 DIRS += drv/usbhub 133 DIRS += drv/usbkbd 134 DIRS += drv/vhc 125 135 endif 126 136 … … 148 158 lib/packet \ 149 159 lib/net 160 161 ifeq ($(UARCH),amd64) 162 LIBS += lib/usb 163 LIBS += lib/usbvirt 164 endif 165 166 ifeq ($(UARCH),ia32) 167 LIBS += lib/usb 168 LIBS += lib/usbvirt 169 endif 150 170 151 171 LIBC_BUILD = $(addsuffix .build,$(LIBC)) -
uspace/Makefile.common
r6eb794a r467bf40 86 86 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui 87 87 88 89 LIBUSB_PREFIX = $(LIB_PREFIX)/usb 90 LIBUSBVIRT_PREFIX = $(LIB_PREFIX)/usbvirt 88 91 LIBDRV_PREFIX = $(LIB_PREFIX)/drv 89 92 LIBPACKET_PREFIX = $(LIB_PREFIX)/packet -
uspace/app/init/init.c
r6eb794a r467bf40 312 312 getterm("term/vc5", "/app/bdsh", false); 313 313 getterm("term/vc6", "/app/klog", false); 314 getterm("term/vc7", "/srv/devman", false); 314 315 315 316 return 0; -
uspace/app/tester/Makefile
r6eb794a r467bf40 31 31 BINARY = tester 32 32 33 LIBS += $(LIBUSB_PREFIX)/libusb.a 34 EXTRA_CFLAGS += -I$(LIBUSB_PREFIX)/include 35 33 36 SOURCES = \ 34 37 tester.c \ 38 adt/usbaddrkeep.c \ 35 39 thread/thread1.c \ 36 40 print/print1.c \ -
uspace/app/tester/tester.c
r6eb794a r467bf40 63 63 #include "mm/malloc1.def" 64 64 #include "hw/serial/serial1.def" 65 #include "adt/usbaddrkeep.def" 65 66 #include "hw/misc/virtchar1.def" 66 67 {NULL, NULL, NULL, false} -
uspace/app/tester/tester.h
r6eb794a r467bf40 80 80 extern const char *test_malloc1(void); 81 81 extern const char *test_serial1(void); 82 extern const char *test_usbaddrkeep(void); 82 83 extern const char *test_virtchar1(void); 83 84 -
uspace/doc/doxygroups.h
r6eb794a r467bf40 155 155 * @endcond 156 156 */ 157 157 158 158 /** 159 159 * @defgroup emul Emulation Libraries … … 170 170 * @ingroup emul 171 171 */ 172 173 /** 174 * @defgroup usb USB 175 * @ingroup uspace 176 * @brief USB support for HelenOS. 177 */ 178 /** 179 * @defgroup libusb USB library 180 * @ingroup usb 181 * @brief Library for creating USB devices drivers. 182 */ -
uspace/drv/root/root.c
r6eb794a r467bf40 88 88 89 89 int res = child_device_register_wrapper(parent, VIRTUAL_DEVICE_NAME, 90 VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE); 90 VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE, 91 NULL); 91 92 92 93 return res; … … 136 137 137 138 res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME, 138 match_id, PLATFORM_DEVICE_MATCH_SCORE );139 match_id, PLATFORM_DEVICE_MATCH_SCORE, NULL); 139 140 140 141 return res; -
uspace/drv/rootvirt/devices.def
r6eb794a r467bf40 22 22 }, 23 23 #endif 24 /* Virtual USB host controller. */ 25 { 26 .name = "usbhc", 27 .match_id = "usb&hc=vhc" 28 }, -
uspace/drv/rootvirt/rootvirt.c
r6eb794a r467bf40 84 84 85 85 int rc = child_device_register_wrapper(parent, virt_dev->name, 86 virt_dev->match_id, 10 );86 virt_dev->match_id, 10, NULL); 87 87 88 88 if (rc == EOK) { -
uspace/drv/test1/test1.c
r6eb794a r467bf40 62 62 63 63 int rc = child_device_register_wrapper(parent, name, 64 match_id, match_score );64 match_id, match_score, NULL); 65 65 66 66 if (rc == EOK) { -
uspace/drv/test2/test2.c
r6eb794a r467bf40 64 64 65 65 int rc = child_device_register_wrapper(parent, name, 66 match_id, match_score );66 match_id, match_score, NULL); 67 67 68 68 if (rc == EOK) { -
uspace/lib/c/generic/devman.c
r6eb794a r467bf40 230 230 231 231 if (flags & IPC_FLAG_BLOCKING) { 232 phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,232 phone = async_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN, 233 233 DEVMAN_CONNECT_TO_DEVICE, handle); 234 234 } else { 235 phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAN,235 phone = async_connect_me_to(PHONE_NS, SERVICE_DEVMAN, 236 236 DEVMAN_CONNECT_TO_DEVICE, handle); 237 237 } -
uspace/lib/c/include/ipc/dev_iface.h
r6eb794a r467bf40 38 38 HW_RES_DEV_IFACE = 0, 39 39 CHAR_DEV_IFACE, 40 41 /** Interface provided by USB host controller. */ 42 USBHC_DEV_IFACE, 43 40 44 // TODO add more interfaces 41 45 DEV_IFACE_MAX … … 50 54 DEV_IFACE_ID(DEV_FIRST_CUSTOM_METHOD_IDX) 51 55 56 /* 57 * The first argument is actually method (as the "real" method is used 58 * for indexing into interfaces. 59 */ 60 61 #define DEV_IPC_GET_ARG1(call) IPC_GET_ARG2((call)) 62 #define DEV_IPC_GET_ARG2(call) IPC_GET_ARG3((call)) 63 #define DEV_IPC_GET_ARG3(call) IPC_GET_ARG4((call)) 64 #define DEV_IPC_GET_ARG4(call) IPC_GET_ARG5((call)) 65 52 66 53 67 #endif -
uspace/lib/drv/Makefile
r6eb794a r467bf40 29 29 30 30 USPACE_PREFIX = ../.. 31 EXTRA_CFLAGS = -Iinclude 31 EXTRA_CFLAGS = -Iinclude -I$(LIBUSB_PREFIX)/include 32 32 LIBRARY = libdrv 33 33 … … 36 36 generic/dev_iface.c \ 37 37 generic/remote_res.c \ 38 generic/remote_usbhc.c \ 38 39 generic/remote_char.c 39 40 -
uspace/lib/drv/generic/dev_iface.c
r6eb794a r467bf40 39 39 #include "remote_res.h" 40 40 #include "remote_char.h" 41 #include "remote_usbhc.h" 41 42 42 43 static iface_dipatch_table_t remote_ifaces = { 43 44 .ifaces = { 44 45 &remote_res_iface, 45 &remote_char_iface 46 &remote_char_iface, 47 &remote_usbhc_iface 46 48 } 47 49 }; -
uspace/lib/drv/generic/driver.c
r6eb794a r467bf40 390 390 */ 391 391 int child_device_register_wrapper(device_t *parent, const char *child_name, 392 const char *child_match_id, int child_match_score) 392 const char *child_match_id, int child_match_score, 393 devman_handle_t *child_handle) 393 394 { 394 395 device_t *child = NULL; … … 418 419 goto failure; 419 420 421 if (child_handle != NULL) { 422 *child_handle = child->handle; 423 } 420 424 return EOK; 421 425 -
uspace/lib/drv/include/driver.h
r6eb794a r467bf40 199 199 200 200 int child_device_register(device_t *, device_t *); 201 int child_device_register_wrapper(device_t *, const char *, const char *, int); 201 int child_device_register_wrapper(device_t *, const char *, const char *, int, 202 devman_handle_t *); 202 203 203 204 -
uspace/srv/devman/devman.c
r6eb794a r467bf40 133 133 printf(NAME": the '%s' driver was added to the list of available " 134 134 "drivers.\n", drv->name); 135 136 printf(NAME ": match ids:"); 137 link_t *cur; 138 for (cur = drv->match_ids.ids.next; cur != &drv->match_ids.ids; cur = cur->next) { 139 match_id_t *match_id = list_get_instance(cur, match_id_t, link); 140 printf(" %d:%s", match_id->score, match_id->id); 141 } 142 printf("\n"); 135 143 } 136 144 -
uspace/srv/net/tl/udp/udp.c
r6eb794a r467bf40 711 711 int socket_id; 712 712 size_t addrlen; 713 size_t size ;713 size_t size = 0; 714 714 ipc_call_t answer; 715 715 int answer_count;
Note:
See TracChangeset
for help on using the changeset viewer.