summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/net
diff options
context:
space:
mode:
authorthompsa <thompsa@FreeBSD.org>2009-05-29 18:46:57 +0000
committerthompsa <thompsa@FreeBSD.org>2009-05-29 18:46:57 +0000
commit44c17bdf07d7ee7ab581951d10bfe1b3300a21a5 (patch)
tree5ff9fef81906105040348e5e28fafc3efac89f62 /sys/dev/usb/net
parent40062c9280416ae05d892e9651e3889e64644621 (diff)
downloadFreeBSD-src-44c17bdf07d7ee7ab581951d10bfe1b3300a21a5.zip
FreeBSD-src-44c17bdf07d7ee7ab581951d10bfe1b3300a21a5.tar.gz
s/usb2_/usb_/ on all typedefs for the USB stack.
Diffstat (limited to 'sys/dev/usb/net')
-rw-r--r--sys/dev/usb/net/if_aue.c26
-rw-r--r--sys/dev/usb/net/if_axe.c24
-rw-r--r--sys/dev/usb/net/if_cdce.c22
-rw-r--r--sys/dev/usb/net/if_cue.c20
-rw-r--r--sys/dev/usb/net/if_kue.c22
-rw-r--r--sys/dev/usb/net/if_rue.c22
-rw-r--r--sys/dev/usb/net/if_udav.c22
-rw-r--r--sys/dev/usb/net/usb_ethernet.c16
-rw-r--r--sys/dev/usb/net/usb_ethernet.h16
9 files changed, 95 insertions, 95 deletions
diff --git a/sys/dev/usb/net/if_aue.c b/sys/dev/usb/net/if_aue.c
index a384fc4..1e37e8c 100644
--- a/sys/dev/usb/net/if_aue.c
+++ b/sys/dev/usb/net/if_aue.c
@@ -177,17 +177,17 @@ static miibus_readreg_t aue_miibus_readreg;
static miibus_writereg_t aue_miibus_writereg;
static miibus_statchg_t aue_miibus_statchg;
-static usb2_callback_t aue_intr_callback;
-static usb2_callback_t aue_bulk_read_callback;
-static usb2_callback_t aue_bulk_write_callback;
-
-static usb2_ether_fn_t aue_attach_post;
-static usb2_ether_fn_t aue_init;
-static usb2_ether_fn_t aue_stop;
-static usb2_ether_fn_t aue_start;
-static usb2_ether_fn_t aue_tick;
-static usb2_ether_fn_t aue_setmulti;
-static usb2_ether_fn_t aue_setpromisc;
+static usb_callback_t aue_intr_callback;
+static usb_callback_t aue_bulk_read_callback;
+static usb_callback_t aue_bulk_write_callback;
+
+static uether_fn_t aue_attach_post;
+static uether_fn_t aue_init;
+static uether_fn_t aue_stop;
+static uether_fn_t aue_start;
+static uether_fn_t aue_tick;
+static uether_fn_t aue_setmulti;
+static uether_fn_t aue_setpromisc;
static uint8_t aue_csr_read_1(struct aue_softc *, uint16_t);
static uint16_t aue_csr_read_2(struct aue_softc *, uint16_t);
@@ -288,7 +288,7 @@ static uint8_t
aue_csr_read_1(struct aue_softc *sc, uint16_t reg)
{
struct usb_device_request req;
- usb2_error_t err;
+ usb_error_t err;
uint8_t val;
req.bmRequestType = UT_READ_VENDOR_DEVICE;
@@ -307,7 +307,7 @@ static uint16_t
aue_csr_read_2(struct aue_softc *sc, uint16_t reg)
{
struct usb_device_request req;
- usb2_error_t err;
+ usb_error_t err;
uint16_t val;
req.bmRequestType = UT_READ_VENDOR_DEVICE;
diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c
index 99fb7e3..69f9b00 100644
--- a/sys/dev/usb/net/if_axe.c
+++ b/sys/dev/usb/net/if_axe.c
@@ -152,21 +152,21 @@ static device_probe_t axe_probe;
static device_attach_t axe_attach;
static device_detach_t axe_detach;
-static usb2_callback_t axe_intr_callback;
-static usb2_callback_t axe_bulk_read_callback;
-static usb2_callback_t axe_bulk_write_callback;
+static usb_callback_t axe_intr_callback;
+static usb_callback_t axe_bulk_read_callback;
+static usb_callback_t axe_bulk_write_callback;
static miibus_readreg_t axe_miibus_readreg;
static miibus_writereg_t axe_miibus_writereg;
static miibus_statchg_t axe_miibus_statchg;
-static usb2_ether_fn_t axe_attach_post;
-static usb2_ether_fn_t axe_init;
-static usb2_ether_fn_t axe_stop;
-static usb2_ether_fn_t axe_start;
-static usb2_ether_fn_t axe_tick;
-static usb2_ether_fn_t axe_setmulti;
-static usb2_ether_fn_t axe_setpromisc;
+static uether_fn_t axe_attach_post;
+static uether_fn_t axe_init;
+static uether_fn_t axe_stop;
+static uether_fn_t axe_start;
+static uether_fn_t axe_tick;
+static uether_fn_t axe_setmulti;
+static uether_fn_t axe_setpromisc;
static int axe_ifmedia_upd(struct ifnet *);
static void axe_ifmedia_sts(struct ifnet *, struct ifmediareq *);
@@ -259,7 +259,7 @@ static int
axe_cmd(struct axe_softc *sc, int cmd, int index, int val, void *buf)
{
struct usb_device_request req;
- usb2_error_t err;
+ usb_error_t err;
AXE_LOCK_ASSERT(sc, MA_OWNED);
@@ -600,7 +600,7 @@ static void
axe_reset(struct axe_softc *sc)
{
struct usb_config_descriptor *cd;
- usb2_error_t err;
+ usb_error_t err;
cd = usb2_get_config_descriptor(sc->sc_ue.ue_udev);
diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index 9032042..a4f2350 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -71,17 +71,17 @@ static device_suspend_t cdce_suspend;
static device_resume_t cdce_resume;
static usb_handle_request_t cdce_handle_request;
-static usb2_callback_t cdce_bulk_write_callback;
-static usb2_callback_t cdce_bulk_read_callback;
-static usb2_callback_t cdce_intr_read_callback;
-static usb2_callback_t cdce_intr_write_callback;
-
-static usb2_ether_fn_t cdce_attach_post;
-static usb2_ether_fn_t cdce_init;
-static usb2_ether_fn_t cdce_stop;
-static usb2_ether_fn_t cdce_start;
-static usb2_ether_fn_t cdce_setmulti;
-static usb2_ether_fn_t cdce_setpromisc;
+static usb_callback_t cdce_bulk_write_callback;
+static usb_callback_t cdce_bulk_read_callback;
+static usb_callback_t cdce_intr_read_callback;
+static usb_callback_t cdce_intr_write_callback;
+
+static uether_fn_t cdce_attach_post;
+static uether_fn_t cdce_init;
+static uether_fn_t cdce_stop;
+static uether_fn_t cdce_start;
+static uether_fn_t cdce_setmulti;
+static uether_fn_t cdce_setpromisc;
static uint32_t cdce_m_crc32(struct mbuf *, uint32_t, uint32_t);
diff --git a/sys/dev/usb/net/if_cue.c b/sys/dev/usb/net/if_cue.c
index 3eba24d7..cf37520 100644
--- a/sys/dev/usb/net/if_cue.c
+++ b/sys/dev/usb/net/if_cue.c
@@ -87,16 +87,16 @@ static device_probe_t cue_probe;
static device_attach_t cue_attach;
static device_detach_t cue_detach;
-static usb2_callback_t cue_bulk_read_callback;
-static usb2_callback_t cue_bulk_write_callback;
-
-static usb2_ether_fn_t cue_attach_post;
-static usb2_ether_fn_t cue_init;
-static usb2_ether_fn_t cue_stop;
-static usb2_ether_fn_t cue_start;
-static usb2_ether_fn_t cue_tick;
-static usb2_ether_fn_t cue_setmulti;
-static usb2_ether_fn_t cue_setpromisc;
+static usb_callback_t cue_bulk_read_callback;
+static usb_callback_t cue_bulk_write_callback;
+
+static uether_fn_t cue_attach_post;
+static uether_fn_t cue_init;
+static uether_fn_t cue_stop;
+static uether_fn_t cue_start;
+static uether_fn_t cue_tick;
+static uether_fn_t cue_setmulti;
+static uether_fn_t cue_setpromisc;
static uint8_t cue_csr_read_1(struct cue_softc *, uint16_t);
static uint16_t cue_csr_read_2(struct cue_softc *, uint8_t);
diff --git a/sys/dev/usb/net/if_kue.c b/sys/dev/usb/net/if_kue.c
index 137f90e..a2a1c2d 100644
--- a/sys/dev/usb/net/if_kue.c
+++ b/sys/dev/usb/net/if_kue.c
@@ -130,15 +130,15 @@ static device_probe_t kue_probe;
static device_attach_t kue_attach;
static device_detach_t kue_detach;
-static usb2_callback_t kue_bulk_read_callback;
-static usb2_callback_t kue_bulk_write_callback;
+static usb_callback_t kue_bulk_read_callback;
+static usb_callback_t kue_bulk_write_callback;
-static usb2_ether_fn_t kue_attach_post;
-static usb2_ether_fn_t kue_init;
-static usb2_ether_fn_t kue_stop;
-static usb2_ether_fn_t kue_start;
-static usb2_ether_fn_t kue_setmulti;
-static usb2_ether_fn_t kue_setpromisc;
+static uether_fn_t kue_attach_post;
+static uether_fn_t kue_init;
+static uether_fn_t kue_stop;
+static uether_fn_t kue_start;
+static uether_fn_t kue_setmulti;
+static uether_fn_t kue_setpromisc;
static int kue_do_request(struct kue_softc *,
struct usb_device_request *, void *);
@@ -221,7 +221,7 @@ static int
kue_do_request(struct kue_softc *sc, struct usb_device_request *req,
void *data)
{
- usb2_error_t err;
+ usb_error_t err;
err = usb2_ether_do_request(&sc->sc_ue, req, data, 60000);
@@ -267,7 +267,7 @@ kue_load_fw(struct kue_softc *sc)
{
struct usb_device_descriptor *dd;
uint16_t hwrev;
- usb2_error_t err;
+ usb_error_t err;
dd = usb2_get_device_descriptor(sc->sc_ue.ue_udev);
hwrev = UGETW(dd->bcdDevice);
@@ -391,7 +391,7 @@ static void
kue_reset(struct kue_softc *sc)
{
struct usb_config_descriptor *cd;
- usb2_error_t err;
+ usb_error_t err;
cd = usb2_get_config_descriptor(sc->sc_ue.ue_udev);
diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c
index 68d7bb3..7eadb5c 100644
--- a/sys/dev/usb/net/if_rue.c
+++ b/sys/dev/usb/net/if_rue.c
@@ -110,17 +110,17 @@ static miibus_readreg_t rue_miibus_readreg;
static miibus_writereg_t rue_miibus_writereg;
static miibus_statchg_t rue_miibus_statchg;
-static usb2_callback_t rue_intr_callback;
-static usb2_callback_t rue_bulk_read_callback;
-static usb2_callback_t rue_bulk_write_callback;
-
-static usb2_ether_fn_t rue_attach_post;
-static usb2_ether_fn_t rue_init;
-static usb2_ether_fn_t rue_stop;
-static usb2_ether_fn_t rue_start;
-static usb2_ether_fn_t rue_tick;
-static usb2_ether_fn_t rue_setmulti;
-static usb2_ether_fn_t rue_setpromisc;
+static usb_callback_t rue_intr_callback;
+static usb_callback_t rue_bulk_read_callback;
+static usb_callback_t rue_bulk_write_callback;
+
+static uether_fn_t rue_attach_post;
+static uether_fn_t rue_init;
+static uether_fn_t rue_stop;
+static uether_fn_t rue_start;
+static uether_fn_t rue_tick;
+static uether_fn_t rue_setmulti;
+static uether_fn_t rue_setpromisc;
static int rue_read_mem(struct rue_softc *, uint16_t, void *, int);
static int rue_write_mem(struct rue_softc *, uint16_t, void *, int);
diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c
index 50ba416..008f408 100644
--- a/sys/dev/usb/net/if_udav.c
+++ b/sys/dev/usb/net/if_udav.c
@@ -70,17 +70,17 @@ static device_probe_t udav_probe;
static device_attach_t udav_attach;
static device_detach_t udav_detach;
-static usb2_callback_t udav_bulk_write_callback;
-static usb2_callback_t udav_bulk_read_callback;
-static usb2_callback_t udav_intr_callback;
-
-static usb2_ether_fn_t udav_attach_post;
-static usb2_ether_fn_t udav_init;
-static usb2_ether_fn_t udav_stop;
-static usb2_ether_fn_t udav_start;
-static usb2_ether_fn_t udav_tick;
-static usb2_ether_fn_t udav_setmulti;
-static usb2_ether_fn_t udav_setpromisc;
+static usb_callback_t udav_bulk_write_callback;
+static usb_callback_t udav_bulk_read_callback;
+static usb_callback_t udav_intr_callback;
+
+static uether_fn_t udav_attach_post;
+static uether_fn_t udav_init;
+static uether_fn_t udav_stop;
+static uether_fn_t udav_start;
+static uether_fn_t udav_tick;
+static uether_fn_t udav_setmulti;
+static uether_fn_t udav_setpromisc;
static int udav_csr_read(struct udav_softc *, uint16_t, void *, int);
static int udav_csr_write(struct udav_softc *, uint16_t, void *, int);
diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c
index 3d0c18d..3d7ae51 100644
--- a/sys/dev/usb/net/usb_ethernet.c
+++ b/sys/dev/usb/net/usb_ethernet.c
@@ -48,13 +48,13 @@ MODULE_DEPEND(uether, miibus, 1, 1, 1);
static struct unrhdr *ueunit;
-static usb2_proc_callback_t ue_attach_post_task;
-static usb2_proc_callback_t ue_promisc_task;
-static usb2_proc_callback_t ue_setmulti_task;
-static usb2_proc_callback_t ue_ifmedia_task;
-static usb2_proc_callback_t ue_tick_task;
-static usb2_proc_callback_t ue_start_task;
-static usb2_proc_callback_t ue_stop_task;
+static usb_proc_callback_t ue_attach_post_task;
+static usb_proc_callback_t ue_promisc_task;
+static usb_proc_callback_t ue_setmulti_task;
+static usb_proc_callback_t ue_ifmedia_task;
+static usb_proc_callback_t ue_tick_task;
+static usb_proc_callback_t ue_start_task;
+static usb_proc_callback_t ue_stop_task;
static void ue_init(void *);
static void ue_start(struct ifnet *);
@@ -79,7 +79,7 @@ usb2_ether_pause(struct usb_ether *ue, unsigned int _ticks)
static void
ue_queue_command(struct usb_ether *ue,
- usb2_proc_callback_t *fn,
+ usb_proc_callback_t *fn,
struct usb_proc_msg *t0, struct usb_proc_msg *t1)
{
struct usb_ether_cfg_task *task;
diff --git a/sys/dev/usb/net/usb_ethernet.h b/sys/dev/usb/net/usb_ethernet.h
index 9b63efd..10908cc 100644
--- a/sys/dev/usb/net/usb_ethernet.h
+++ b/sys/dev/usb/net/usb_ethernet.h
@@ -52,16 +52,16 @@
struct usb_ether;
struct usb_device_request;
-typedef void (usb2_ether_fn_t)(struct usb_ether *);
+typedef void (uether_fn_t)(struct usb_ether *);
struct usb_ether_methods {
- usb2_ether_fn_t *ue_attach_post;
- usb2_ether_fn_t *ue_start;
- usb2_ether_fn_t *ue_init;
- usb2_ether_fn_t *ue_stop;
- usb2_ether_fn_t *ue_setmulti;
- usb2_ether_fn_t *ue_setpromisc;
- usb2_ether_fn_t *ue_tick;
+ uether_fn_t *ue_attach_post;
+ uether_fn_t *ue_start;
+ uether_fn_t *ue_init;
+ uether_fn_t *ue_stop;
+ uether_fn_t *ue_setmulti;
+ uether_fn_t *ue_setpromisc;
+ uether_fn_t *ue_tick;
int (*ue_mii_upd)(struct ifnet *);
void (*ue_mii_sts)(struct ifnet *,
struct ifmediareq *);
OpenPOWER on IntegriCloud