Changeset ea6a824 in mainline
- Timestamp:
- 2011-01-28T10:49:24Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 81c0854f, 89beb08
- Parents:
- 6265a2b (diff), c5c003c (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. - Files:
-
- 2 added
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
.bzrignore
r6265a2b rea6a824 67 67 ./uspace/app/usbinfo/usbinfo 68 68 ./uspace/app/virtusbkbd/vuk 69 ./uspace/app/virtusbhub/vuh 70 ./uspace/app/virtusbhub/vhc_hub/* 69 71 ./uspace/app/websrv/websrv 70 72 ./uspace/dist/app/* -
boot/Makefile.common
r6265a2b rea6a824 144 144 $(USPACE_PATH)/app/usbinfo/usbinfo \ 145 145 $(USPACE_PATH)/app/virtusbkbd/vuk \ 146 $(USPACE_PATH)/app/virtusbhub/vuh \ 146 147 $(USPACE_PATH)/app/websrv/websrv 147 148 -
uspace/Makefile
r6265a2b rea6a824 53 53 app/usbinfo \ 54 54 app/virtusbkbd \ 55 app/virtusbhub \ 55 56 app/netecho \ 56 57 app/nettest1 \ -
uspace/app/virtusbkbd/descriptor.h
r6265a2b rea6a824 27 27 */ 28 28 29 /** @addtogroup usb 29 /** @addtogroup usbvirtkbd 30 30 * @{ 31 31 */ -
uspace/app/virtusbkbd/items.h
r6265a2b rea6a824 27 27 */ 28 28 29 /** @addtogroup usb 29 /** @addtogroup usbvirtkbd 30 30 * @{ 31 31 */ -
uspace/app/virtusbkbd/kbdconfig.c
r6265a2b rea6a824 27 27 */ 28 28 29 /** @addtogroup usb 29 /** @addtogroup usbvirtkbd 30 30 * @{ 31 31 */ -
uspace/app/virtusbkbd/kbdconfig.h
r6265a2b rea6a824 27 27 */ 28 28 29 /** @addtogroup usb 29 /** @addtogroup usbvirtkbd 30 30 * @{ 31 31 */ -
uspace/app/virtusbkbd/keys.c
r6265a2b rea6a824 27 27 */ 28 28 29 /** @addtogroup usb 29 /** @addtogroup usbvirtkbd 30 30 * @{ 31 31 */ -
uspace/app/virtusbkbd/keys.h
r6265a2b rea6a824 27 27 */ 28 28 29 /** @addtogroup usb 29 /** @addtogroup usbvirtkbd 30 30 * @{ 31 31 */ -
uspace/app/virtusbkbd/report.h
r6265a2b rea6a824 27 27 */ 28 28 29 /** @addtogroup usb 29 /** @addtogroup usbvirtkbd 30 30 * @{ 31 31 */ -
uspace/app/virtusbkbd/stdreq.c
r6265a2b rea6a824 27 27 */ 28 28 29 /** @addtogroup usb 29 /** @addtogroup usbvirtkbd 30 30 * @{ 31 31 */ -
uspace/app/virtusbkbd/stdreq.h
r6265a2b rea6a824 27 27 */ 28 28 29 /** @addtogroup usb 29 /** @addtogroup usbvirtkbd 30 30 * @{ 31 31 */ -
uspace/app/virtusbkbd/virtusbkbd.c
r6265a2b rea6a824 27 27 */ 28 28 29 /** @addtogroup usb 29 /** @addtogroup usbvirtkbd 30 30 * @{ 31 31 */ -
uspace/doc/doxygroups.h
r6265a2b rea6a824 195 195 */ 196 196 197 /** 198 * @defgroup usbvirthub Virtual USB hub 199 * @ingroup usbvirt 200 * @brief Extra virtual USB hub for virtual host controller. 201 * @details 202 * Some of the sources are shared with virtual host controller, 203 * see @ref drvusbvhc for the rest of the files. 204 */ 205 206 /** 207 * @defgroup usbvirtkbd Virtual USB keybaord 208 * @ingroup usbvirt 209 * @brief Virtual USB keyboard for virtual host controller. 210 */ 211 197 212 /** 198 213 * @defgroup drvusbhub USB hub driver -
uspace/drv/vhc/hub/hub.h
r6265a2b rea6a824 38 38 #include <fibril_synch.h> 39 39 40 #ifndef HUB_PORT_COUNT 40 41 #define HUB_PORT_COUNT 2 42 #endif 41 43 #define BITS2BYTES(bits) (bits ? ((((bits)-1)>>3)+1) : 0) 42 44 -
uspace/drv/vhc/hub/virthub.c
r6265a2b rea6a824 164 164 dev->device_data = hub; 165 165 166 usbvirt_connect_local(dev); 167 168 return EOK; 166 int rc; 167 #ifdef STANDALONE_HUB 168 dev->name = "hub"; 169 rc = usbvirt_connect(dev); 170 #else 171 rc = usbvirt_connect_local(dev); 172 #endif 173 174 return rc; 169 175 } 170 176 -
uspace/drv/vhc/hub/virthub.h
r6265a2b rea6a824 37 37 38 38 #include <usbvirt/device.h> 39 #include "hub.h" 40 41 #ifdef STANDALONE_HUB 42 #define virtdev_connection_t int 43 #else 39 44 #include "../devices.h" 40 # include "hub.h"45 #endif 41 46 42 47 /** Endpoint number for status change pipe. */
Note:
See TracChangeset
for help on using the changeset viewer.