Changes in / [ea6a824:6265a2b] in mainline


Ignore:
Files:
2 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • .bzrignore

    rea6a824 r6265a2b  
    6767./uspace/app/usbinfo/usbinfo
    6868./uspace/app/virtusbkbd/vuk
    69 ./uspace/app/virtusbhub/vuh
    70 ./uspace/app/virtusbhub/vhc_hub/*
    7169./uspace/app/websrv/websrv
    7270./uspace/dist/app/*

  • boot/Makefile.common

    rea6a824 r6265a2b  
    144144        $(USPACE_PATH)/app/usbinfo/usbinfo \
    145145        $(USPACE_PATH)/app/virtusbkbd/vuk \
    146         $(USPACE_PATH)/app/virtusbhub/vuh \
    147146        $(USPACE_PATH)/app/websrv/websrv
    148147

  • uspace/Makefile

    rea6a824 r6265a2b  
    5353        app/usbinfo \
    5454        app/virtusbkbd \
    55         app/virtusbhub \
    5655        app/netecho \
    5756        app/nettest1 \

  • uspace/app/virtusbkbd/descriptor.h

    rea6a824 r6265a2b  
    2727 */
    2828
    29 /** @addtogroup usbvirtkbd
     29/** @addtogroup usb
    3030 * @{
    3131 */

  • uspace/app/virtusbkbd/items.h

    rea6a824 r6265a2b  
    2727 */
    2828
    29 /** @addtogroup usbvirtkbd
     29/** @addtogroup usb
    3030 * @{
    3131 */

  • uspace/app/virtusbkbd/kbdconfig.c

    rea6a824 r6265a2b  
    2727 */
    2828
    29 /** @addtogroup usbvirtkbd
     29/** @addtogroup usb
    3030 * @{
    3131 */

  • uspace/app/virtusbkbd/kbdconfig.h

    rea6a824 r6265a2b  
    2727 */
    2828
    29 /** @addtogroup usbvirtkbd
     29/** @addtogroup usb
    3030 * @{
    3131 */

  • uspace/app/virtusbkbd/keys.c

    rea6a824 r6265a2b  
    2727 */
    2828
    29 /** @addtogroup usbvirtkbd
     29/** @addtogroup usb
    3030 * @{
    3131 */

  • uspace/app/virtusbkbd/keys.h

    rea6a824 r6265a2b  
    2727 */
    2828
    29 /** @addtogroup usbvirtkbd
     29/** @addtogroup usb
    3030 * @{
    3131 */

  • uspace/app/virtusbkbd/report.h

    rea6a824 r6265a2b  
    2727 */
    2828
    29 /** @addtogroup usbvirtkbd
     29/** @addtogroup usb
    3030 * @{
    3131 */

  • uspace/app/virtusbkbd/stdreq.c

    rea6a824 r6265a2b  
    2727 */
    2828
    29 /** @addtogroup usbvirtkbd
     29/** @addtogroup usb
    3030 * @{
    3131 */

  • uspace/app/virtusbkbd/stdreq.h

    rea6a824 r6265a2b  
    2727 */
    2828
    29 /** @addtogroup usbvirtkbd
     29/** @addtogroup usb
    3030 * @{
    3131 */

  • uspace/app/virtusbkbd/virtusbkbd.c

    rea6a824 r6265a2b  
    2727 */
    2828
    29 /** @addtogroup usbvirtkbd
     29/** @addtogroup usb
    3030 * @{
    3131 */

  • uspace/doc/doxygroups.h

    rea6a824 r6265a2b  
    195195                 */
    196196
    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 
    212197         /**
    213198          * @defgroup drvusbhub USB hub driver

  • uspace/drv/vhc/hub/hub.h

    rea6a824 r6265a2b  
    3838#include <fibril_synch.h>
    3939
    40 #ifndef HUB_PORT_COUNT
    4140#define HUB_PORT_COUNT 2
    42 #endif
    4341#define BITS2BYTES(bits) (bits ? ((((bits)-1)>>3)+1) : 0)
    4442

  • uspace/drv/vhc/hub/virthub.c

    rea6a824 r6265a2b  
    164164        dev->device_data = hub;
    165165
    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;
     166        usbvirt_connect_local(dev);
     167
     168        return EOK;
    175169}
    176170

  • uspace/drv/vhc/hub/virthub.h

    rea6a824 r6265a2b  
    3737
    3838#include <usbvirt/device.h>
     39#include "../devices.h"
    3940#include "hub.h"
    40 
    41 #ifdef STANDALONE_HUB
    42 #define virtdev_connection_t int
    43 #else
    44 #include "../devices.h"
    45 #endif
    4641
    4742/** Endpoint number for status change pipe. */
Note: See TracChangeset for help on using the changeset viewer.