Changeset 962ce100 in mainline

Timestamp:

2011-02-14T10:30:19Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

28cb8bf7

Parents:

d15809b4

Message:

Unused code removal in libusb

We dropped the effort to have hub driver and host controller driver
in the same task a long time ago but files with incomplete
implementation were still present. They are gone now.

More cleaning will probably come.

Location:

uspace

Files:

• drv/vhc/conn.h (modified) (2 diffs)
• lib/usb/Makefile (modified) (1 diff)
• lib/usb/include/usb/hcdhubd.h (modified) (1 diff)
• lib/usb/src/hcdhubd.c (deleted)
• lib/usb/src/hcdrv.c (deleted)
• lib/usb/src/localdrv.c (deleted)
• lib/usb/src/remotedrv.c (deleted)

uspace/drv/vhc/conn.h

@@ -37 +37 @@
 
 #include <usb/usb.h>
-#include <usb/hcdhubd.h>
 #include <usbhc_iface.h>
 #include "vhcd.h"
@@ -44 +43 @@
 void connection_handler_host(sysarg_t);
 
-usb_hcd_transfer_ops_t vhc_transfer_ops;
 usbhc_iface_t vhc_iface;
 

uspace/lib/usb/Makefile

@@ -39 +39 @@
         src/drvpsync.c \
         src/dump.c \
-        src/hcdhubd.c \
-        src/hcdrv.c \
         src/hidparser.c \
-        src/localdrv.c \
         src/pipes.c \
         src/pipesinit.c \
         src/recognise.c \
-        src/remotedrv.c \
         src/request.c \
         src/usb.c \

uspace/lib/usb/include/usb/hcdhubd.h

@@ -65 +65 @@
 } usb_hcd_attached_device_info_t;
 
-
-/** Host controller device. */
-typedef struct usb_hc_device usb_hc_device_t;
-
-/** Callback for OUT transfers. */
-typedef void (*usb_hcd_transfer_callback_out_t)
-    (usb_hc_device_t *, usb_transaction_outcome_t, void *);
-
-/** Callback for IN transfers. */
-typedef void (*usb_hcd_transfer_callback_in_t)
-    (usb_hc_device_t *, size_t, usb_transaction_outcome_t, void *);
-
-
-/** Transfer functions provided by each USB host controller driver. */
-typedef struct {
-        /** OUT transfer.
-         * @param hc Host controller that shall enqueue the transfer.
-         * @param dev Target device.
-         * @param ep Target endpoint.
-         * @param buffer Buffer to be sent.
-         * @param size Buffer size.
-         * @param callback Callback after transfer was processed by hardware.
-         * @param arg Callback argument.
-         */
-        int (*transfer_out)(usb_hc_device_t *hc,
-            usb_hcd_attached_device_info_t *dev, usb_hc_endpoint_info_t *ep,
-            void *buffer, size_t size,
-            usb_hcd_transfer_callback_out_t callback, void *arg);
-
-        /** SETUP transfer. */
-        int (*transfer_setup)(usb_hc_device_t *,
-            usb_hcd_attached_device_info_t *, usb_hc_endpoint_info_t *,
-            void *, size_t,
-            usb_hcd_transfer_callback_out_t, void *);
-
-        /** IN transfer. */
-        int (*transfer_in)(usb_hc_device_t *,
-            usb_hcd_attached_device_info_t *, usb_hc_endpoint_info_t *,
-            void *, size_t,
-            usb_hcd_transfer_callback_in_t, void *);
-} usb_hcd_transfer_ops_t;
-
-/**
- * @brief structure holding information about free and used addresses
- *
- * This structure should not be used outside usb hcd driver.
- * You better consider it to be 'private'.
- */
-typedef struct {
-        /** lower bound included in the interval */
-        usb_address_t lower_bound;
-
-        /** upper bound, excluded from the interval */
-        usb_address_t upper_bound;
-
-        /** */
-        link_t link;
-}usb_address_list_t;
-
-struct usb_hc_device {
-        /** Transfer operations. */
-        usb_hcd_transfer_ops_t *transfer_ops;
-
-        /** Custom HC data. */
-        void *data;
-
-        /** Generic device entry (read-only). */
-        device_t *generic;
-
-        /** List of attached devices. */
-        link_t attached_devices;
-
-        /** List of hubs operating from this HC. */
-        link_t hubs;
-
-        /** Structure with free and used addresses */
-        link_t addresses;
-
-        /** Link to other driven HCs. */
-        link_t link;
-};
-
-/** Host controller driver. */
-typedef struct {
-        /** Driver name. */
-        const char *name;
-        /** Callback when device (host controller) is added. */
-        int (*add_hc)(usb_hc_device_t *device);
-} usb_hc_driver_t;
-
-
-int usb_hcd_main(usb_hc_driver_t *);
-int usb_hcd_add_root_hub(device_t *dev);
-
-/**
- * find first not yet used address on this host controller and use it
- * @param this_hcd
- * @return number in the range of allowed usb addresses or
- *     a negative number if not succesful
- */
-usb_address_t usb_use_free_address(usb_hc_device_t * this_hcd);
-
-/**
- * @brief free the address in the address space of this hcd.
- *
- * if address is not used, nothing happens
- * @param this_hcd
- * @param addr
- */
-void usb_free_used_address(usb_hc_device_t * this_hcd, usb_address_t addr );
-
-
-/*
- * Functions to be used by drivers within same task as the HC driver.
- * This will probably include only hub drivers.
- */
-
-device_t *usb_hc_connect(device_t *);
-
-int usb_hc_async_interrupt_out(usb_hc_device_t *, usb_target_t,
-    void *, size_t, usb_handle_t *);
-int usb_hc_async_interrupt_in(usb_hc_device_t *, usb_target_t,
-    void *, size_t, size_t *, usb_handle_t *);
-
-int usb_hc_async_control_write_setup(usb_hc_device_t *, usb_target_t,
-    void *, size_t, usb_handle_t *);
-int usb_hc_async_control_write_data(usb_hc_device_t *, usb_target_t,
-    void *, size_t, usb_handle_t *);
-int usb_hc_async_control_write_status(usb_hc_device_t *, usb_target_t,
-    usb_handle_t *);
-
-int usb_hc_async_control_read_setup(usb_hc_device_t *, usb_target_t,
-    void *, size_t, usb_handle_t *);
-int usb_hc_async_control_read_data(usb_hc_device_t *, usb_target_t,
-    void *, size_t, size_t *, usb_handle_t *);
-int usb_hc_async_control_read_status(usb_hc_device_t *, usb_target_t,
-    usb_handle_t *);
-
-int usb_hc_async_wait_for(usb_handle_t);
-
-int usb_hc_add_child_device(device_t *, const char *, const char *, bool);
-
-
 /**
  * @}