Changes in / [a09128c:c113056] in mainline


Ignore:
Files:
11 added
12 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • .bzrignore

    ra09128c rc113056  
    8686./uspace/drv/uhci/uhci
    8787./uspace/drv/usbhub/usbhub
    88 ./uspace/drv/usbhid/usbhid
     88./uspace/drv/usbkbd/usbkbd
    8989./uspace/drv/vhc/vhc
    9090./uspace/srv/bd/ata_bd/ata_bd

  • boot/arch/amd64/Makefile.inc

    ra09128c rc113056  
    4545        uhci \
    4646        usbhub \
    47         usbhid \
     47        usbkbd \
    4848        vhc
    4949

  • uspace/Makefile

    ra09128c rc113056  
    118118                srv/hw/irc/i8259 \
    119119                drv/uhci \
    120                 drv/usbhid \
    121120                drv/usbhub \
     121                drv/usbkbd \
    122122                drv/vhc
    123123endif
    … …  
    132132                srv/hw/irc/i8259 \
    133133                drv/uhci \
    134                 drv/usbhid \
    135134                drv/usbhub \
     135                drv/usbkbd \
    136136                drv/vhc
    137137endif

  • uspace/app/usbinfo/dump.c

    ra09128c rc113056  
    2727 */
    2828
    29 /** @addtogroup usbinfo
     29/** @addtogroup usb
    3030 * @{
    3131 */
    3232/**
    3333 * @file
    34  * USB querying.
     34 * @brief USB querying.
    3535 */
    3636

  • uspace/app/usbinfo/info.c

    ra09128c rc113056  
    2727 */
    2828
    29 /** @addtogroup usbinfo
     29/** @addtogroup usb
    3030 * @{
    3131 */
    3232/**
    3333 * @file
    34  * Dumping of generic device properties.
     34 * @brief
    3535 */
    3636#include <stdio.h>

  • uspace/app/usbinfo/main.c

    ra09128c rc113056  
    2727 */
    2828
    29 /** @addtogroup usbinfo
     29/** @addtogroup usb
    3030 * @{
    3131 */
    3232/**
    3333 * @file
    34  * USB querying.
     34 * @brief USB querying.
    3535 */
    3636

  • uspace/app/usbinfo/usbinfo.h

    ra09128c rc113056  
    2727 */
    2828
    29 /** @addtogroup usbinfo
     29/** @addtogroup usb
    3030 * @{
    3131 */
    3232/** @file
    33  * Common header for usbinfo application.
     33 * @brief Common header for usbinfo application.
    3434 */
    3535#ifndef USBINFO_USBINFO_H_

  • uspace/doc/doxygroups.h

    ra09128c rc113056  
    210210                 */
    211211
    212         /**
    213          * @defgroup usbinfo USB info application
    214          * @ingroup usb
    215          * @brief Application for querying USB devices.
    216          * @details
    217          * The intended usage of this application is to query new USB devices
    218          * for their descriptors etc. to simplify driver writing.
    219          */
    220 
    221         /**
    222          * @defgroup drvusbhub USB hub driver
    223          * @ingroup usb
    224          * @brief USB hub driver.
    225          */
    226 
    227         /**
    228          * @defgroup drvusbhid USB HID driver
    229          * @ingroup usb
    230          * @brief USB driver for HID devices.
    231          */
    232 
    233         /**
    234          * @defgroup drvusbuhci UHCI driver
    235          * @ingroup usb
    236          * @brief Driver for USB host controller UHCI.
    237          */
    238 
     212         /**
     213          * @defgroup drvusbhub USB hub driver
     214          * @ingroup usb
     215          * @brief USB hub driver.
     216          */
     217
     218         /**
     219          * @defgroup drvusbhid USB HID driver
     220          * @ingroup usb
     221          * @brief USB driver for HID devices.
     222          */
     223
     224         /**
     225          * @defgroup drvusbuhci UHCI driver
     226          * @ingroup usb
     227          * @brief Driver for USB host controller UHCI.
     228          */
     229

  • uspace/drv/uhci/Makefile

    ra09128c rc113056  
    3434SOURCES = \
    3535        main.c \
    36         pci.c \
    3736        transfers.c
    3837

  • uspace/drv/uhci/main.c

    ra09128c rc113056  
    3030#include <usb/debug.h>
    3131#include <errno.h>
    32 #include <str_error.h>
    3332#include <driver.h>
    3433#include "uhci.h"
    … …  
    5655        usb_dprintf(NAME, 1, "uhci_add_device() called\n");
    5756        device->ops = &uhci_ops;
    58 
    59         uintptr_t io_reg_base;
    60         size_t io_reg_size;
    61         int irq;
    62 
    63         int rc = pci_get_my_registers(device,
    64             &io_reg_base, &io_reg_size, &irq);
    65 
    66         if (rc != EOK) {
    67                 fprintf(stderr,
    68                     NAME ": failed to get I/O registers addresses: %s.\n",
    69                     str_error(rc));
    70                 return rc;
    71         }
    72 
    73         usb_dprintf(NAME, 2, "I/O regs at 0x%X (size %zu), IRQ %d.\n",
    74             io_reg_base, io_reg_size, irq);
    7557
    7658        /*

  • uspace/drv/uhci/uhci.h

    ra09128c rc113056  
    2727 */
    2828
    29 /** @addtogroup drvusbuhci
     29/** @addtogroup usb
    3030 * @{
    3131 */
    … …  
    4242usbhc_iface_t uhci_iface;
    4343
    44 int pci_get_my_registers(device_t *, uintptr_t *, size_t *, int *);
    45 
    4644#endif
    4745/**
Note: See TracChangeset for help on using the changeset viewer.