Changeset ea6a824 in mainline


Ignore:
Timestamp:
2011-01-28T10:49:24Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
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.
Message:

Merge standalone virtual hub

Files:
2 added
17 edited

Legend:

Unmodified
Added
Removed

  • .bzrignore

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

  • boot/Makefile.common

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

  • uspace/Makefile

    r6265a2b rea6a824  
    5353        app/usbinfo \
    5454        app/virtusbkbd \
     55        app/virtusbhub \
    5556        app/netecho \
    5657        app/nettest1 \

  • uspace/app/virtusbkbd/descriptor.h

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

  • uspace/app/virtusbkbd/items.h

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

  • uspace/app/virtusbkbd/kbdconfig.c

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

  • uspace/app/virtusbkbd/kbdconfig.h

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

  • uspace/app/virtusbkbd/keys.c

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

  • uspace/app/virtusbkbd/keys.h

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

  • uspace/app/virtusbkbd/report.h

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

  • uspace/app/virtusbkbd/stdreq.c

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

  • uspace/app/virtusbkbd/stdreq.h

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

  • uspace/app/virtusbkbd/virtusbkbd.c

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

  • uspace/doc/doxygroups.h

    r6265a2b rea6a824  
    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
    197212         /**
    198213          * @defgroup drvusbhub USB hub driver

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

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

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

    r6265a2b rea6a824  
    164164        dev->device_data = hub;
    165165
    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;
    169175}
    170176

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

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