Changeset 8e7c9fe in mainline for uspace/drv/bus/usb


Ignore:
Timestamp:
2014-09-12T03:45:25Z (11 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c53b58e
Parents:
3eb0c85 (diff), 105d8d6 (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 mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

Location:
uspace/drv/bus/usb
Files:
1 added
17 edited
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/uhci/utils/malloc32.h

    r3eb0c85 r8e7c9fe  
    101101{
    102102        uintptr_t phys;
    103         void *address;
     103        void *address = AS_AREA_ANY;
    104104
    105105        const int ret = dmamem_map_anonymous(UHCI_REQUIRED_PAGE_SIZE,

  • uspace/drv/bus/usb/usbhid/Makefile

    r3eb0c85 r8e7c9fe  
    5050        mouse/mousedev.c \
    5151        multimedia/multimedia.c \
    52         multimedia/keymap.c
     52        multimedia/keymap.c \
     53        blink1/blink1.c
    5354
    5455SOURCES = \

  • uspace/drv/bus/usb/usbhid/blink1/blink1.h

    r3eb0c85 r8e7c9fe  
    11/*
    2  * Copyright (c) 2005 Martin Decky
     2 * Copyright (c) 2014 Martin Decky
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup mips64
     29/** @addtogroup drvusbhid
    3030 * @{
    3131 */
    3232/** @file
     33 * USB blink(1) subdriver.
    3334 */
    3435
    35 #ifndef KERN_mips64_ARCH_H_
    36 #define KERN_mips64_ARCH_H_
     36#ifndef USB_HID_BLINK1_H_
     37#define USB_HID_BLINK1_H_
    3738
    38 #include <typedefs.h>
     39#include <usb/dev/driver.h>
     40#include "../usbhid.h"
    3941
    40 #define TASKMAP_MAX_RECORDS        32
    41 #define CPUMAP_MAX_RECORDS         32
    42 #define BOOTINFO_TASK_NAME_BUFLEN  32
     42/** Container for USB blink(1) device. */
     43typedef struct {
     44        /** DDF blink(1) function */
     45        ddf_fun_t *fun;
     46       
     47        /** USB HID device */
     48        usb_hid_dev_t *hid_dev;
     49} usb_blink1_t;
    4350
    44 extern size_t cpu_count;
     51extern const char *HID_BLINK1_FUN_NAME;
     52extern const char *HID_BLINK1_CATEGORY;
    4553
    46 typedef struct {
    47         void *addr;
    48         size_t size;
    49         char name[BOOTINFO_TASK_NAME_BUFLEN];
    50 } utask_t;
     54extern int usb_blink1_init(usb_hid_dev_t *, void **);
     55extern void usb_blink1_deinit(usb_hid_dev_t *, void *);
    5156
    52 typedef struct {
    53         uint32_t cpumap;
    54         size_t cnt;
    55         utask_t tasks[TASKMAP_MAX_RECORDS];
    56 } bootinfo_t;
     57#endif // USB_HID_BLINK1_H_
    5758
    58 extern void arch_pre_main(void *entry, bootinfo_t *bootinfo);
    59 
    60 #endif
    61 
    62 /** @}
     59/**
     60 * @}
    6361 */

  • uspace/drv/bus/usb/usbhid/generic/hiddev.c

    r3eb0c85 r8e7c9fe  
    4646#include "usbhid.h"
    4747
    48 
    49 
    5048const usb_endpoint_description_t usb_hid_generic_poll_endpoint_description = {
    5149        .transfer_type = USB_TRANSFER_INTERRUPT,
    … …  
    5856
    5957const char *HID_GENERIC_FUN_NAME = "hid";
    60 const char *HID_GENERIC_CLASS_NAME = "hid";
     58const char *HID_GENERIC_CATEGORY = "hid";
    6159
    6260
    … …  
    223221        return true;
    224222}
     223
    225224/**
    226225 * @}

  • uspace/drv/bus/usb/usbhid/generic/hiddev.h

    r3eb0c85 r8e7c9fe  
    3838
    3939#include <usb/dev/driver.h>
    40 
    41 struct usb_hid_dev;
     40#include "../usbhid.h"
    4241
    4342extern const usb_endpoint_description_t
    4443    usb_hid_generic_poll_endpoint_description;
    4544
    46 const char *HID_GENERIC_FUN_NAME;
    47 const char *HID_GENERIC_CLASS_NAME;
     45extern const char *HID_GENERIC_FUN_NAME;
     46extern const char *HID_GENERIC_CATEGORY;
    4847
    4948/** The USB HID generic 'hid' function softstate */
    5049typedef struct {
    51         struct usb_hid_dev *hid_dev;
     50        usb_hid_dev_t *hid_dev;
    5251} usb_hid_gen_fun_t;
    5352
    54 int usb_generic_hid_init(struct usb_hid_dev *hid_dev, void **data);
    55 
    56 void usb_generic_hid_deinit(struct usb_hid_dev *hid_dev, void *data);
    57 
    58 bool usb_generic_hid_polling_callback(struct usb_hid_dev *hid_dev, void *data);
     53extern int usb_generic_hid_init(usb_hid_dev_t *, void **);
     54extern void usb_generic_hid_deinit(usb_hid_dev_t *, void *);
     55extern bool usb_generic_hid_polling_callback(usb_hid_dev_t *, void *);
    5956
    6057#endif // USB_HID_HIDDDEV_H_

  • uspace/drv/bus/usb/usbhid/kbd/kbddev.c

    r3eb0c85 r8e7c9fe  
    666666
    667667        usb_log_debug("Adding DDF function to category %s...\n",
    668             HID_KBD_CLASS_NAME);
     668            HID_KBD_CATEGORY_NAME);
    669669        ret = ddf_fun_add_to_category(fun, HID_KBD_CATEGORY_NAME);
    670670        if (ret != EOK) {
    671671                usb_log_error(
    672672                    "Could not add DDF function to category %s: %s.\n",
    673                     HID_KBD_CLASS_NAME, str_error(ret));
     673                    HID_KBD_CATEGORY_NAME, str_error(ret));
    674674                usb_kbd_destroy(kbd_dev);
    675675                if (ddf_fun_unbind(fun) == EOK) {

  • uspace/drv/bus/usb/usbhid/kbd/kbddev.h

    r3eb0c85 r8e7c9fe  
    4545#include <usb/dev/pipes.h>
    4646#include <usb/dev/driver.h>
    47 
     47#include "../usbhid.h"
    4848#include "kbdrepeat.h"
    49 
    50 struct usb_hid_dev;
    51 
    5249
    5350/**
    … …  
    6562typedef struct usb_kbd_t {
    6663        /** Link to HID device structure */
    67         struct usb_hid_dev *hid_dev;
    68 
     64        usb_hid_dev_t *hid_dev;
     65       
    6966        /** Previously pressed keys (not translated to key codes). */
    7067        int32_t *keys_old;
    … …  
    7572        /** Currently pressed modifiers (bitmap). */
    7673        uint8_t modifiers;
    77 
     74       
    7875        /** Currently active modifiers including locks. Sent to the console. */
    79         unsigned mods;
    80 
     76        unsigned int mods;
     77       
    8178        /** Currently active lock keys. */
    82         unsigned lock_keys;
    83 
     79        unsigned int lock_keys;
     80       
    8481        /** IPC session to client (for sending key events). */
    8582        async_sess_t *client_sess;
    86 
     83       
    8784        /** Information for auto-repeat of keys. */
    8885        usb_kbd_repeat_t repeat;
    89 
     86       
    9087        /** Mutex for accessing the information about auto-repeat. */
    9188        fibril_mutex_t repeat_mtx;
    92 
     89       
    9390        uint8_t *output_buffer;
    94 
     91       
    9592        size_t output_size;
    96 
     93       
    9794        size_t led_output_size;
    98 
     95       
    9996        usb_hid_report_path_t *led_path;
    100 
     97       
    10198        int32_t *led_data;
    102 
     99       
    103100        /** State of the structure (for checking before use).
    104          * 
     101         *
    105102         * 0 - not initialized
    106103         * 1 - initialized
    … …  
    108105         */
    109106        int initialized;
    110 
     107       
    111108        /** DDF function */
    112109        ddf_fun_t *fun;
    113110} usb_kbd_t;
    114111
    115 
    116 
    117112extern const usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description;
    118113
    119 const char *HID_KBD_FUN_NAME;
    120 const char *HID_KBD_CLASS_NAME;
     114extern const char *HID_KBD_FUN_NAME;
     115extern const char *HID_KBD_CATEGORY;
    121116
    122 
    123 
    124 int usb_kbd_init(struct usb_hid_dev *hid_dev, void **data);
    125 
    126 bool usb_kbd_polling_callback(struct usb_hid_dev *hid_dev, void *data);
    127 
    128 int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev);
    129 
    130 int usb_kbd_is_ready_to_destroy(const usb_kbd_t *kbd_dev);
    131 
    132 void usb_kbd_destroy(usb_kbd_t *kbd_dev);
    133 
    134 void usb_kbd_push_ev(usb_kbd_t *kbd_dev,
    135     int type, unsigned int key);
    136 
    137 void usb_kbd_deinit(struct usb_hid_dev *hid_dev, void *data);
    138 
    139 int usb_kbd_set_boot_protocol(struct usb_hid_dev *hid_dev);
     117extern int usb_kbd_init(usb_hid_dev_t *, void **);
     118extern bool usb_kbd_polling_callback(usb_hid_dev_t *, void *);
     119extern int usb_kbd_is_initialized(const usb_kbd_t *);
     120extern int usb_kbd_is_ready_to_destroy(const usb_kbd_t *);
     121extern void usb_kbd_destroy(usb_kbd_t *);
     122extern void usb_kbd_push_ev(usb_kbd_t *, int, unsigned int);
     123extern void usb_kbd_deinit(usb_hid_dev_t *, void *);
     124extern int usb_kbd_set_boot_protocol(usb_hid_dev_t *);
    140125
    141126#endif /* USB_HID_KBDDEV_H_ */

  • uspace/drv/bus/usb/usbhid/mouse/mousedev.h

    r3eb0c85 r8e7c9fe  
    3939#include <usb/dev/driver.h>
    4040#include <async.h>
    41 
    42 struct usb_hid_dev;
    43 
    44 
     41#include "../usbhid.h"
    4542
    4643/** Container for USB mouse device. */
    … …  
    4845        /** IPC session to consumer. */
    4946        async_sess_t *mouse_sess;
    50 
    51         /* Mouse buttons statuses. */
     47       
     48        /** Mouse buttons statuses. */
    5249        int32_t *buttons;
    5350        size_t buttons_count;
    54 
    55         /* DDF mouse function */
     51       
     52        /** DDF mouse function */
    5653        ddf_fun_t *mouse_fun;
    5754} usb_mouse_t;
    5855
    59 
    60 
    6156extern const usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description;
    6257
    63 const char *HID_MOUSE_FUN_NAME;
    64 const char *HID_MOUSE_CATEGORY;
     58extern const char *HID_MOUSE_FUN_NAME;
     59extern const char *HID_MOUSE_CATEGORY;
    6560
    66 
    67 
    68 int usb_mouse_init(struct usb_hid_dev *hid_dev, void **data);
    69 
    70 bool usb_mouse_polling_callback(struct usb_hid_dev *hid_dev, void *data);
    71 
    72 void usb_mouse_deinit(struct usb_hid_dev *hid_dev, void *data);
    73 
    74 int usb_mouse_set_boot_protocol(struct usb_hid_dev *hid_dev);
    75 
    76 
     61extern int usb_mouse_init(usb_hid_dev_t *, void **);
     62extern bool usb_mouse_polling_callback(usb_hid_dev_t *, void *);
     63extern void usb_mouse_deinit(usb_hid_dev_t *, void *);
     64extern int usb_mouse_set_boot_protocol(usb_hid_dev_t *);
    7765
    7866#endif // USB_HID_MOUSEDEV_H_

  • uspace/drv/bus/usb/usbhid/multimedia/multimedia.c

    r3eb0c85 r8e7c9fe  
    11/*
    2  * Copyright (c) 2011 Lubos Slovak, Vojtech Horky
     2 * Copyright (c) 2011 Lubos Slovak
     3 * Copyright (c) 2011 Vojtech Horky
    34 * All rights reserved.
    45 *

  • uspace/drv/bus/usb/usbhid/multimedia/multimedia.h

    r3eb0c85 r8e7c9fe  
    3838
    3939#include <usb/dev/driver.h>
     40#include "../usbhid.h"
    4041
    41 struct usb_hid_dev;
    42 
    43 
    44 
    45 int usb_multimedia_init(struct usb_hid_dev *hid_dev, void **data);
    46 
    47 void usb_multimedia_deinit(struct usb_hid_dev *hid_dev, void *data);
    48 
    49 bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data);
    50 
    51 
     42extern int usb_multimedia_init(usb_hid_dev_t *, void **);
     43extern void usb_multimedia_deinit(usb_hid_dev_t *, void *);
     44extern bool usb_multimedia_polling_callback(usb_hid_dev_t *, void *);
    5245
    5346#endif // USB_HID_MULTIMEDIA_H_

  • uspace/drv/bus/usb/usbhid/subdrivers.c

    r3eb0c85 r8e7c9fe  
    3737#include <usb/hid/usages/core.h>
    3838#include <usb/hid/hidpath.h>
    39 
     39#include "kbd/kbddev.h"
     40#include "mouse/mousedev.h"
    4041#include "multimedia/multimedia.h"
    41 #include "mouse/mousedev.h"
     42#include "blink1/blink1.h"
    4243#include "generic/hiddev.h"
    4344
    4445static const usb_hid_subdriver_usage_t path_kbd[] = {
    45         {USB_HIDUT_PAGE_GENERIC_DESKTOP,
    46          USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD},
     46        {
     47                USB_HIDUT_PAGE_GENERIC_DESKTOP,
     48                USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD
     49        },
    4750        {0, 0}
    4851};
    4952
    5053static const usb_hid_subdriver_usage_t path_mouse[] = {
    51         {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE},
     54        {
     55                USB_HIDUT_PAGE_GENERIC_DESKTOP,
     56                USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE
     57        },
    5258        {0, 0}
    5359};
    5460
    55 static const usb_hid_subdriver_usage_t multim_key_path[] = {
    56         {USB_HIDUT_PAGE_CONSUMER, USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL},
     61static const usb_hid_subdriver_usage_t path_multim_key[] = {
     62        {
     63                USB_HIDUT_PAGE_CONSUMER,
     64                USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL
     65        },
    5766        {0, 0}
    5867};
    … …  
    7382        },
    7483        {
    75                 multim_key_path,
     84                path_multim_key,
    7685                1,
    7786                USB_HID_PATH_COMPARE_BEGIN,
    … …  
    98107                }
    99108        },
     109        {
     110                NULL,
     111                0,
     112                USB_HID_PATH_COMPARE_BEGIN,
     113                0x27b8,
     114                0x01ed,
     115                {
     116                        .init = usb_blink1_init,
     117                        .deinit = usb_blink1_deinit,
     118                        .poll = NULL,
     119                        .poll_end = NULL
     120                }
     121        }
    100122};
    101123

  • uspace/drv/bus/usb/usbhid/subdrivers.h

    r3eb0c85 r8e7c9fe  
    4040#include "kbd/kbddev.h"
    4141
    42 
    43 
    4442typedef struct usb_hid_subdriver_usage {
    4543        int usage_page;
    … …  
    4745} usb_hid_subdriver_usage_t;
    4846
    49 
    50 
    51 /** Structure representing the mapping between device requirements and the
     47/** Structure representing the mapping between device requirements and the
    5248 *  subdriver supposed to handle this device.
    5349 *
    … …  
    5551 * a new subdriver mapping will be created and used by the HID driver when it
    5652 * searches for appropriate subdrivers for a device.
     53 *
    5754 */
    5855typedef struct usb_hid_subdriver_mapping {
    59         /** Usage path that the device's Input reports must contain.
     56        /** Usage path that the device's input reports must contain.
    6057         *
    6158         * It is an array of pairs <usage_page, usage>, terminated by a <0, 0>
    … …  
    6461         */
    6562        const usb_hid_subdriver_usage_t *usage_path;
    66 
     63       
    6764        /** Report ID for which the path should apply. */
    6865        int report_id;
    69 
    70         /** Compare type for the Usage path. */
     66       
     67        /** Compare type for the usage path. */
    7168        int compare;
    72 
     69       
    7370        /** Vendor ID (set to -1 if not specified). */
    7471        int vendor_id;
    75 
     72       
    7673        /** Product ID (set to -1 if not specified). */
    7774        int product_id;
    78 
     75       
    7976        /** Subdriver for controlling this device. */
    8077        const usb_hid_subdriver_t subdriver;
    8178} usb_hid_subdriver_mapping_t;
    8279
    83 
    84 
    8580extern const usb_hid_subdriver_mapping_t usb_hid_subdrivers[];
    8681extern const size_t USB_HID_MAX_SUBDRIVERS;
    87 
    88 
    8982
    9083#endif /* USB_HID_SUBDRIVERS_H_ */

  • uspace/drv/bus/usb/usbhid/usbhid.c

    r3eb0c85 r8e7c9fe  
    415415        }
    416416
    417         /*
    418          * 1) subdriver vytvori vlastnu ddf_fun, vlastne ddf_dev_ops, ktore da
    419          *    do nej.
    420          * 2) do tych ops do .interfaces[DEV_IFACE_USBHID (asi)] priradi
    421          *    vyplnenu strukturu usbhid_iface_t.
    422          * 3) klientska aplikacia - musi si rucne vytvorit telefon
    423          *    (devman_device_connect() - cesta k zariadeniu (/hw/pci0/...) az
    424          *    k tej fcii.
    425          *    pouzit usb/classes/hid/iface.h - prvy int je telefon
    426          */
     417        /* Initialize subdrivers */
    427418        bool ok = false;
    428419        for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {

  • uspace/drv/bus/usb/usbhid/usbhid.ma

    r3eb0c85 r8e7c9fe  
    1 100 usb&interface&class=HID&subclass=0x01&protocol=0x01
     11000 usb&interface&class=HID&subclass=0x01&protocol=0x01
    221000 usb&interface&class=HID&subclass=0x01&protocol=0x02
    33100 usb&interface&class=HID

  • uspace/drv/bus/usb/usbmast/bo_trans.h

    r3eb0c85 r8e7c9fe  
    4343#include <usb/dev/driver.h>
    4444#include "usbmast.h"
    45 
    46 #define BULK_IN_EP 0
    47 #define BULK_OUT_EP 1
    4845
    4946typedef enum cmd_status {

  • uspace/drv/bus/usb/usbmast/main.c

    r3eb0c85 r8e7c9fe  
    8282static int usbmast_bd_close(bd_srv_t *);
    8383static int usbmast_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
     84static int usbmast_bd_sync_cache(bd_srv_t *, aoff64_t, size_t);
    8485static int usbmast_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
    8586static int usbmast_bd_get_block_size(bd_srv_t *, size_t *);
    … …  
    9091        .close = usbmast_bd_close,
    9192        .read_blocks = usbmast_bd_read_blocks,
     93        .sync_cache = usbmast_bd_sync_cache,
    9294        .write_blocks = usbmast_bd_write_blocks,
    9395        .get_block_size = usbmast_bd_get_block_size,
    … …  
    344346}
    345347
     348/** Synchronize blocks to nonvolatile storage. */
     349static int usbmast_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt)
     350{
     351        usbmast_fun_t *mfun = bd_srv_usbmast(bd);
     352
     353        return usbmast_sync_cache(mfun, ba, cnt);
     354}
     355
    346356/** Write blocks to the device. */
    347357static int usbmast_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,

  • uspace/drv/bus/usb/usbmast/scsi_ms.c

    r3eb0c85 r8e7c9fe  
    383383}
    384384
     385/** Perform SCSI Synchronize Cache command on USB mass storage device.
     386 *
     387 * @param mfun          Mass storage function
     388 * @param ba            Address of first block
     389 * @param nblocks       Number of blocks to read
     390 * @param data          Data to write
     391 *
     392 * @return              Error code
     393 */
     394int usbmast_sync_cache(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks)
     395{
     396        scsi_cmd_t cmd;
     397        scsi_cdb_sync_cache_10_t cdb;
     398        int rc;
     399
     400        if (ba > UINT32_MAX)
     401                return ELIMIT;
     402
     403        if (nblocks > UINT16_MAX)
     404                return ELIMIT;
     405
     406        memset(&cdb, 0, sizeof(cdb));
     407        cdb.op_code = SCSI_CMD_SYNC_CACHE_10;
     408        cdb.lba = host2uint32_t_be(ba);
     409        cdb.numlb = host2uint16_t_be(nblocks);
     410
     411        memset(&cmd, 0, sizeof(cmd));
     412        cmd.cdb = &cdb;
     413        cmd.cdb_size = sizeof(cdb);
     414
     415        rc = usbmast_run_cmd(mfun, &cmd);
     416
     417        if (rc != EOK) {
     418                usb_log_error("Synchronize Cache (10) transport failed, device %s: %s.\n",
     419                   usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));
     420                return rc;
     421        }
     422
     423        if (cmd.status != CMDS_GOOD) {
     424                usb_log_error("Synchronize Cache (10) command failed, device %s.\n",
     425                   usb_device_get_name(mfun->mdev->usb_dev));
     426                return EIO;
     427        }
     428
     429        return EOK;
     430}
     431
    385432/**
    386433 * @}

  • uspace/drv/bus/usb/usbmast/scsi_ms.h

    r3eb0c85 r8e7c9fe  
    6464extern int usbmast_read(usbmast_fun_t *, uint64_t, size_t, void *);
    6565extern int usbmast_write(usbmast_fun_t *, uint64_t, size_t, const void *);
     66extern int usbmast_sync_cache(usbmast_fun_t *, uint64_t, size_t);
    6667extern const char *usbmast_scsi_dev_type_str(unsigned);
    6768
Note: See TracChangeset for help on using the changeset viewer.