PERFORCE change 117002 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Sat Mar 31 08:00:27 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=117002
Change 117002 by hselasky at hselasky_mini_itx on 2007/03/31 07:59:28
Use "usbd_callback_t" when defining USB device
driver callback prototypes.
Affected files ...
.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#12 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#6 edit
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ubser.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/ucycom.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdi.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/uhid.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/umass.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/umct.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/umoscom.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/uplcom.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/urio.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/uscanner.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/uvisor.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#17 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#9 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#12 (text) ====
@@ -130,6 +130,17 @@
static device_attach_t atausb_attach;
static device_detach_t atausb_detach;
+static usbd_callback_t atausb_t_bbb_reset1_callback;
+static usbd_callback_t atausb_t_bbb_reset2_callback;
+static usbd_callback_t atausb_t_bbb_reset3_callback;
+static usbd_callback_t atausb_t_bbb_command_callback;
+static usbd_callback_t atausb_t_bbb_data_read_callback;
+static usbd_callback_t atausb_t_bbb_data_rd_cs_callback;
+static usbd_callback_t atausb_t_bbb_data_write_callback;
+static usbd_callback_t atausb_t_bbb_data_wr_cs_callback;
+static usbd_callback_t atausb_t_bbb_status_callback;
+static usbd_callback_t atausb_tr_error;
+
static void
atausb_watchdog(void *arg);
@@ -137,39 +148,9 @@
atausb_transfer_start(struct atausb_softc *sc, u_int8_t xfer_no);
static void
-atausb_t_bbb_reset1_callback(struct usbd_xfer *xfer);
-
-static void
-atausb_t_bbb_reset2_callback(struct usbd_xfer *xfer);
-
-static void
-atausb_t_bbb_reset3_callback(struct usbd_xfer *xfer);
-
-static void
atausb_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer,
u_int8_t next_xfer,
u_int8_t stall_xfer);
-static void
-atausb_t_bbb_command_callback(struct usbd_xfer *xfer);
-
-static void
-atausb_t_bbb_data_read_callback(struct usbd_xfer *xfer);
-
-static void
-atausb_t_bbb_data_rd_cs_callback(struct usbd_xfer *xfer);
-
-static void
-atausb_t_bbb_data_write_callback(struct usbd_xfer *xfer);
-
-static void
-atausb_t_bbb_data_wr_cs_callback(struct usbd_xfer *xfer);
-
-static void
-atausb_t_bbb_status_callback(struct usbd_xfer *xfer);
-
-static void
-atausb_tr_error(struct usbd_xfer *xfer);
-
static int
ata_usbchannel_begin_transaction(struct ata_request *request);
==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#8 (text+ko) ====
@@ -303,6 +303,14 @@
static device_attach_t uaudio_attach;
static device_detach_t uaudio_detach;
+static usbd_callback_t uaudio_chan_play_callback;
+static usbd_callback_t uaudio_chan_record_callback;
+static usbd_callback_t uaudio_mixer_write_cfg_callback;
+static usbd_callback_t umidi_read_clear_stall_callback;
+static usbd_callback_t umidi_bulk_read_callback;
+static usbd_callback_t umidi_write_clear_stall_callback;
+static usbd_callback_t umidi_bulk_write_callback;
+
#ifdef USB_DEBUG
static void
uaudio_chan_dump_ep_desc(const usb_endpoint_descriptor_audio_t *ed);
@@ -317,12 +325,6 @@
uaudio_chan_fill_info(struct uaudio_softc *sc, struct usbd_device *udev);
static void
-uaudio_chan_play_callback(struct usbd_xfer *xfer);
-
-static void
-uaudio_chan_record_callback(struct usbd_xfer *xfer);
-
-static void
uaudio_mixer_add_ctl_sub(struct uaudio_softc *sc,
struct uaudio_mixer_node *mc);
static void
@@ -399,9 +401,6 @@
static u_int16_t
uaudio_mixer_get(struct usbd_device *udev, u_int8_t what,
struct uaudio_mixer_node *mc);
-static void
-uaudio_mixer_write_cfg_callback(struct usbd_xfer *xfer);
-
static usbd_status
uaudio_set_speed(struct usbd_device *udev, u_int8_t endpt, u_int32_t speed);
@@ -417,21 +416,9 @@
static void
uaudio_mixer_init(struct uaudio_softc *sc);
-static void
-umidi_read_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-umidi_bulk_read_callback(struct usbd_xfer *xfer);
-
-static void
-umidi_write_clear_stall_callback(struct usbd_xfer *xfer);
-
static u_int8_t
umidi_convert_to_usb(struct umidi_sub_chan *sub, u_int8_t cn, u_int8_t b);
-static void
-umidi_bulk_write_callback(struct usbd_xfer *xfer);
-
static struct umidi_sub_chan *
umidi_sub_by_cdev(struct usb_cdev *cdev);
==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#19 (text+ko) ====
@@ -190,11 +190,20 @@
};
#define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p))
+/* prototypes */
+
static device_probe_t aue_probe;
static device_attach_t aue_attach;
static device_detach_t aue_detach;
static device_shutdown_t aue_shutdown;
+static usbd_callback_t aue_intr_clear_stall_callback;
+static usbd_callback_t aue_intr_callback;
+static usbd_callback_t aue_bulk_read_clear_stall_callback;
+static usbd_callback_t aue_bulk_read_callback;
+static usbd_callback_t aue_bulk_write_clear_stall_callback;
+static usbd_callback_t aue_bulk_write_callback;
+
static void
aue_cfg_do_request(struct aue_softc *sc, usb_device_request_t *req,
void *data);
@@ -239,24 +248,6 @@
aue_cfg_reset(struct aue_softc *sc);
static void
-aue_intr_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-aue_intr_callback(struct usbd_xfer *xfer);
-
-static void
-aue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-aue_bulk_read_callback(struct usbd_xfer *xfer);
-
-static void
-aue_bulk_write_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-aue_bulk_write_callback(struct usbd_xfer *xfer);
-
-static void
aue_start_cb(struct ifnet *ifp);
static void
==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#17 (text+ko) ====
@@ -146,6 +146,13 @@
static device_detach_t axe_detach;
static device_shutdown_t axe_shutdown;
+static usbd_callback_t axe_intr_clear_stall_callback;
+static usbd_callback_t axe_intr_callback;
+static usbd_callback_t axe_bulk_read_clear_stall_callback;
+static usbd_callback_t axe_bulk_read_callback;
+static usbd_callback_t axe_bulk_write_clear_stall_callback;
+static usbd_callback_t axe_bulk_write_callback;
+
static void
axe_cfg_cmd(struct axe_softc *sc, u_int16_t cmd, u_int16_t index,
u_int16_t val, void *buf);
@@ -175,24 +182,6 @@
axe_cfg_reset(struct axe_softc *sc);
static void
-axe_intr_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-axe_intr_callback(struct usbd_xfer *xfer);
-
-static void
-axe_bulk_read_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-axe_bulk_read_callback(struct usbd_xfer *xfer);
-
-static void
-axe_bulk_write_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-axe_bulk_write_callback(struct usbd_xfer *xfer);
-
-static void
axe_start_cb(struct ifnet *ifp);
static void
==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#12 (text+ko) ====
@@ -74,18 +74,17 @@
static device_detach_t cdce_detach;
static device_shutdown_t cdce_shutdown;
+static usbd_callback_t cdce_bulk_write_clear_stall_callback;
+static usbd_callback_t cdce_bulk_write_callback;
+static usbd_callback_t cdce_bulk_read_clear_stall_callback;
+static usbd_callback_t cdce_bulk_read_callback;
+
static void
cdce_start_cb(struct ifnet *ifp);
static void
cdce_start_transfers(struct cdce_softc *sc);
-static void
-cdce_bulk_write_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-cdce_bulk_write_callback(struct usbd_xfer *xfer);
-
static u_int32_t
cdce_m_crc32(struct mbuf *m, u_int32_t src_offset, u_int32_t src_len);
@@ -98,12 +97,6 @@
static void
cdce_init_cb(void *arg);
-static void
-cdce_bulk_read_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-cdce_bulk_read_callback(struct usbd_xfer *xfer);
-
static int
cdce_ifmedia_upd_cb(struct ifnet *ifp);
==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#15 (text+ko) ====
@@ -103,6 +103,11 @@
static device_detach_t cue_detach;
static device_shutdown_t cue_shutdown;
+static usbd_callback_t cue_bulk_read_clear_stall_callback;
+static usbd_callback_t cue_bulk_read_callback;
+static usbd_callback_t cue_bulk_write_clear_stall_callback;
+static usbd_callback_t cue_bulk_write_callback;
+
static usbd_config_td_command_t cue_cfg_promisc_upd;
static usbd_config_td_command_t cue_config_copy;
static usbd_config_td_command_t cue_cfg_first_time_setup;
@@ -137,24 +142,12 @@
cue_cfg_reset(struct cue_softc *sc);
static void
-cue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-cue_bulk_read_callback(struct usbd_xfer *xfer);
-
-static void
cue_start_cb(struct ifnet *ifp);
static void
cue_start_transfers(struct cue_softc *sc);
static void
-cue_bulk_write_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-cue_bulk_write_callback(struct usbd_xfer *xfer);
-
-static void
cue_init_cb(void *arg);
static int
==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#17 (text+ko) ====
@@ -127,11 +127,18 @@
{ 0, 0 }
};
+/* prototypes */
+
static device_probe_t kue_probe;
static device_attach_t kue_attach;
static device_detach_t kue_detach;
static device_shutdown_t kue_shutdown;
+static usbd_callback_t kue_bulk_read_clear_stall_callback;
+static usbd_callback_t kue_bulk_read_callback;
+static usbd_callback_t kue_bulk_write_clear_stall_callback;
+static usbd_callback_t kue_bulk_write_callback;
+
static usbd_config_td_command_t kue_cfg_promisc_upd;
static usbd_config_td_command_t kue_config_copy;
static usbd_config_td_command_t kue_cfg_first_time_setup;
@@ -157,18 +164,6 @@
kue_cfg_reset(struct kue_softc *sc);
static void
-kue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-kue_bulk_read_callback(struct usbd_xfer *xfer);
-
-static void
-kue_bulk_write_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-kue_bulk_write_callback(struct usbd_xfer *xfer);
-
-static void
kue_start_cb(struct ifnet *ifp);
static void
==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#16 (text+ko) ====
@@ -138,6 +138,13 @@
static device_detach_t rue_detach;
static device_shutdown_t rue_shutdown;
+static usbd_callback_t rue_intr_clear_stall_callback;
+static usbd_callback_t rue_intr_callback;
+static usbd_callback_t rue_bulk_read_clear_stall_callback;
+static usbd_callback_t rue_bulk_read_callback;
+static usbd_callback_t rue_bulk_write_clear_stall_callback;
+static usbd_callback_t rue_bulk_write_callback;
+
static usbd_config_td_command_t rue_config_copy;
static usbd_config_td_command_t rue_cfg_promisc_upd;
static usbd_config_td_command_t rue_cfg_first_time_setup;
@@ -180,24 +187,6 @@
rue_cfg_reset(struct rue_softc *sc);
static void
-rue_intr_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-rue_intr_callback(struct usbd_xfer *xfer);
-
-static void
-rue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-rue_bulk_read_callback(struct usbd_xfer *xfer);
-
-static void
-rue_bulk_write_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-rue_bulk_write_callback(struct usbd_xfer *xfer);
-
-static void
rue_start_cb(struct ifnet *ifp);
static void
==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#16 (text+ko) ====
@@ -96,6 +96,13 @@
static device_detach_t udav_detach;
static device_shutdown_t udav_shutdown;
+static usbd_callback_t udav_bulk_write_clear_stall_callback;
+static usbd_callback_t udav_bulk_write_callback;
+static usbd_callback_t udav_bulk_read_clear_stall_callback;
+static usbd_callback_t udav_bulk_read_callback;
+static usbd_callback_t udav_intr_clear_stall_callback;
+static usbd_callback_t udav_intr_callback;
+
static usbd_config_td_command_t udav_cfg_first_time_setup;
static usbd_config_td_command_t udav_cfg_pre_init;
static usbd_config_td_command_t udav_cfg_init;
@@ -133,24 +140,6 @@
static void
udav_start_transfers(struct udav_softc *sc);
-static void
-udav_bulk_write_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-udav_bulk_write_callback(struct usbd_xfer *xfer);
-
-static void
-udav_bulk_read_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-udav_bulk_read_callback(struct usbd_xfer *xfer);
-
-static void
-udav_intr_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
-udav_intr_callback(struct usbd_xfer *xfer);
-
static int
udav_ioctl_cb(struct ifnet *ifp, u_long cmd, caddr_t data);
==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#20 (text+ko) ====
@@ -88,10 +88,16 @@
#endif
/* prototypes */
+
static device_probe_t ural_probe;
static device_attach_t ural_attach;
static device_detach_t ural_detach;
+static usbd_callback_t ural_bulk_read_callback;
+static usbd_callback_t ural_bulk_read_clear_stall_callback;
+static usbd_callback_t ural_bulk_write_callback;
+static usbd_callback_t ural_bulk_write_clear_stall_callback;
+
static usbd_config_td_command_t ural_cfg_first_time_setup;
static usbd_config_td_command_t ural_config_copy;
static usbd_config_td_command_t ural_cfg_set_chan;
@@ -149,12 +155,6 @@
static int
ural_rxrate(struct ural_rx_desc *desc);
-static void
-ural_bulk_read_callback(struct usbd_xfer *xfer);
-
-static void
-ural_bulk_read_clear_stall_callback(struct usbd_xfer *xfer);
-
static u_int16_t
ural_ack_rate(struct ieee80211com *ic, u_int16_t rate);
@@ -169,12 +169,6 @@
ural_setup_tx_desc(struct ural_softc *sc, u_int32_t flags, u_int16_t len,
u_int16_t rate);
static void
-ural_bulk_write_callback(struct usbd_xfer *xfer);
-
-static void
-ural_bulk_write_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
ural_watchdog(void *arg);
static void
==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#6 (text+ko) ====
@@ -82,6 +82,15 @@
static device_attach_t zyd_attach;
static device_detach_t zyd_detach;
+static usbd_callback_t zyd_intr_read_clear_stall_callback;
+static usbd_callback_t zyd_intr_read_callback;
+static usbd_callback_t zyd_intr_write_clear_stall_callback;
+static usbd_callback_t zyd_intr_write_callback;
+static usbd_callback_t zyd_bulk_read_clear_stall_callback;
+static usbd_callback_t zyd_bulk_read_callback;
+static usbd_callback_t zyd_bulk_write_clear_stall_callback;
+static usbd_callback_t zyd_bulk_write_callback;
+
static usbd_config_td_command_t zyd_cfg_first_time_setup;
static usbd_config_td_command_t zyd_cfg_set_run;
static usbd_config_td_command_t zyd_cfg_update_promisc;
@@ -96,11 +105,7 @@
static void zyd_cfg_usbrequest(struct zyd_softc *sc, uint8_t type, uint8_t request, uint16_t value, uint16_t index, uint16_t length, uint8_t *data);
static void zyd_cfg_usbrequestzc(struct zyd_softc *sc, struct zyd_control *zc);
static void zyd_cfg_reset(struct zyd_softc *sc);
-static void zyd_intr_read_clear_stall_callback(struct usbd_xfer *xfer);
-static void zyd_intr_read_callback(struct usbd_xfer *xfer);
static void zyd_cfg_usb_intr_read(struct zyd_softc *sc, void *data, uint32_t size);
-static void zyd_intr_write_clear_stall_callback(struct usbd_xfer *xfer);
-static void zyd_intr_write_callback(struct usbd_xfer *xfer);
static void zyd_cfg_usb_intr_write(struct zyd_softc *sc, void *data, uint32_t size);
static uint32_t zyd_addrinc(uint32_t addr);
static void zyd_cfg_read16(struct zyd_softc *sc, uint32_t addr, uint16_t *value);
@@ -116,8 +121,6 @@
static void zyd_cfg_rfwrite(struct zyd_softc *sc, uint32_t value, uint8_t bits);
static void zyd_cfg_stateoutput(struct zyd_softc *sc) __used;
static void zyd_rxframeproc(struct usbd_xfer *xfer, uint16_t offset, uint16_t len);
-static void zyd_bulk_read_clear_stall_callback(struct usbd_xfer *xfer);
-static void zyd_bulk_read_callback(struct usbd_xfer *xfer);
static uint8_t zyd_cfg_uploadfirmware(struct zyd_softc *sc);
static void zyd_cfg_lock_phy(struct zyd_softc *sc);
static void zyd_cfg_unlock_phy(struct zyd_softc *sc);
@@ -159,8 +162,6 @@
static uint8_t zyd_tx_frame(struct usbd_xfer *xfer, struct mbuf *m0, struct ieee80211_node *ni, uint8_t rate);
static void zyd_start_transfers(struct zyd_softc *sc);
static void zyd_start_cb(struct ifnet *ifp);
-static void zyd_bulk_write_clear_stall_callback(struct usbd_xfer *xfer);
-static void zyd_bulk_write_callback(struct usbd_xfer *xfer);
static void zyd_init_cb(void *arg);
static int zyd_reset_cb(struct ifnet *ifp);
static int zyd_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#15 (text+ko) ====
@@ -167,6 +167,13 @@
static device_attach_t ubsa_attach;
static device_detach_t ubsa_detach;
+static usbd_callback_t ubsa_write_callback;
+static usbd_callback_t ubsa_write_clear_stall_callback;
+static usbd_callback_t ubsa_read_callback;
+static usbd_callback_t ubsa_read_clear_stall_callback;
+static usbd_callback_t ubsa_intr_callback;
+static usbd_callback_t ubsa_intr_clear_stall_callback;
+
static void ubsa_cfg_request(struct ubsa_softc *sc, u_int8_t index, u_int16_t value);
static void ubsa_cfg_set_dtr(struct ucom_softc *ucom, u_int8_t onoff);
static void ubsa_cfg_set_rts(struct ucom_softc *ucom, u_int8_t onoff);
@@ -178,12 +185,6 @@
static void ubsa_start_write(struct ucom_softc *ucom);
static void ubsa_stop_write(struct ucom_softc *ucom);
static void ubsa_cfg_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr);
-static void ubsa_write_callback(struct usbd_xfer *xfer);
-static void ubsa_write_clear_stall_callback(struct usbd_xfer *xfer);
-static void ubsa_read_callback(struct usbd_xfer *xfer);
-static void ubsa_read_clear_stall_callback(struct usbd_xfer *xfer);
-static void ubsa_intr_callback(struct usbd_xfer *xfer);
-static void ubsa_intr_clear_stall_callback(struct usbd_xfer *xfer);
static const struct usbd_config ubsa_config[UBSA_N_TRANSFER] = {
==== //depot/projects/usb/src/sys/dev/usb/ubser.c#10 (text+ko) ====
@@ -136,15 +136,18 @@
uint8_t sc_name[16];
};
+/* prototypes */
+
static device_probe_t ubser_probe;
static device_attach_t ubser_attach;
static device_detach_t ubser_detach;
+static usbd_callback_t ubser_write_clear_stall_callback;
+static usbd_callback_t ubser_write_callback;
+static usbd_callback_t ubser_read_clear_stall_callback;
+static usbd_callback_t ubser_read_callback;
+
static int ubser_pre_param(struct ucom_softc *ucom, struct termios *t);
-static void ubser_write_clear_stall_callback(struct usbd_xfer *xfer);
-static void ubser_write_callback(struct usbd_xfer *xfer);
-static void ubser_read_clear_stall_callback(struct usbd_xfer *xfer);
-static void ubser_read_callback(struct usbd_xfer *xfer);
static void ubser_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff);
static void ubser_cfg_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr);
static void ubser_start_read(struct ucom_softc *ucom);
==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#10 (text+ko) ====
@@ -97,17 +97,18 @@
static device_attach_t ucycom_attach;
static device_detach_t ucycom_detach;
+static usbd_callback_t ucycom_ctrl_write_callback;
+static usbd_callback_t ucycom_intr_read_clear_stall_callback;
+static usbd_callback_t ucycom_intr_read_callback;
+
static void ucycom_cfg_open(struct ucom_softc *ucom);
static void ucycom_start_read(struct ucom_softc *ucom);
static void ucycom_stop_read(struct ucom_softc *ucom);
static void ucycom_start_write(struct ucom_softc *ucom);
static void ucycom_stop_write(struct ucom_softc *ucom);
-static void ucycom_ctrl_write_callback(struct usbd_xfer *xfer);
static void ucycom_cfg_write(struct ucycom_softc *sc, uint32_t baud, uint8_t cfg);
static int ucycom_pre_param(struct ucom_softc *ucom, struct termios *t);
static void ucycom_cfg_param(struct ucom_softc *ucom, struct termios *t);
-static void ucycom_intr_read_clear_stall_callback(struct usbd_xfer *xfer);
-static void ucycom_intr_read_callback(struct usbd_xfer *xfer);
static const struct usbd_config ucycom_config[UCYCOM_ENDPT_MAX] = {
==== //depot/projects/usb/src/sys/dev/usb/udbp.c#8 (text+ko) ====
@@ -119,6 +119,8 @@
u_int8_t sc_name[16];
};
+/* prototypes */
+
static int
udbp_modload(module_t mod, int event, void *data);
@@ -126,21 +128,14 @@
static device_attach_t udbp_attach;
static device_detach_t udbp_detach;
-static void
-udbp_bulk_read_callback(struct usbd_xfer *xfer);
+static usbd_callback_t udbp_bulk_read_callback;
+static usbd_callback_t udbp_bulk_read_clear_stall_callback;
+static usbd_callback_t udbp_bulk_write_callback;
+static usbd_callback_t udbp_bulk_write_clear_stall_callback;
static void
-udbp_bulk_read_clear_stall_callback(struct usbd_xfer *xfer);
-
-static void
udbp_bulk_read_complete(node_p node, hook_p hook, void *arg1, int arg2);
-static void
-udbp_bulk_write_callback(struct usbd_xfer *xfer);
-
-static void
-udbp_bulk_write_clear_stall_callback(struct usbd_xfer *xfer);
-
static ng_constructor_t ng_udbp_constructor;
static ng_rcvmsg_t ng_udbp_rcvmsg;
static ng_shutdown_t ng_udbp_rmnode;
==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#14 (text+ko) ====
@@ -184,18 +184,19 @@
static device_attach_t ufoma_attach;
static device_detach_t ufoma_detach;
+static usbd_callback_t ufoma_ctrl_read_callback;
+static usbd_callback_t ufoma_ctrl_write_callback;
+static usbd_callback_t ufoma_intr_clear_stall_callback;
+static usbd_callback_t ufoma_intr_callback;
+static usbd_callback_t ufoma_bulk_write_callback;
+static usbd_callback_t ufoma_bulk_write_clear_stall_callback;
+static usbd_callback_t ufoma_bulk_read_callback;
+static usbd_callback_t ufoma_bulk_read_clear_stall_callback;
+
static void ufoma_cfg_do_request(struct ufoma_softc *sc, usb_device_request_t *req, void *data);
static void * ufoma_get_intconf(usb_config_descriptor_t *cd, usb_interface_descriptor_t *id, u_int8_t type, u_int8_t subtype);
static void ufoma_cfg_link_state(struct ufoma_softc *sc);
static void ufoma_cfg_activate_state(struct ufoma_softc *sc, u_int16_t state);
-static void ufoma_ctrl_read_callback(struct usbd_xfer *xfer);
-static void ufoma_ctrl_write_callback(struct usbd_xfer *xfer);
-static void ufoma_intr_clear_stall_callback(struct usbd_xfer *xfer);
-static void ufoma_intr_callback(struct usbd_xfer *xfer);
-static void ufoma_bulk_write_callback(struct usbd_xfer *xfer);
-static void ufoma_bulk_write_clear_stall_callback(struct usbd_xfer *xfer);
-static void ufoma_bulk_read_callback(struct usbd_xfer *xfer);
-static void ufoma_bulk_read_clear_stall_callback(struct usbd_xfer *xfer);
static void ufoma_cfg_open(struct ucom_softc *ucom);
static void ufoma_cfg_close(struct ucom_softc *ucom);
static void ufoma_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff);
==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#14 (text+ko) ====
@@ -130,12 +130,13 @@
static device_attach_t uftdi_attach;
static device_detach_t uftdi_detach;
+static usbd_callback_t uftdi_write_callback;
+static usbd_callback_t uftdi_write_clear_stall_callback;
+static usbd_callback_t uftdi_read_callback;
+static usbd_callback_t uftdi_read_clear_stall_callback;
+
static void uftdi_cfg_do_request(struct uftdi_softc *sc, usb_device_request_t *req, void *data);
static void uftdi_cfg_open(struct ucom_softc *ucom);
-static void uftdi_write_callback(struct usbd_xfer *xfer);
-static void uftdi_write_clear_stall_callback(struct usbd_xfer *xfer);
-static void uftdi_read_callback(struct usbd_xfer *xfer);
-static void uftdi_read_clear_stall_callback(struct usbd_xfer *xfer);
static void uftdi_cfg_set_dtr(struct ucom_softc *ucom, u_int8_t onoff);
static void uftdi_cfg_set_rts(struct ucom_softc *ucom, u_int8_t onoff);
static void uftdi_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff);
==== //depot/projects/usb/src/sys/dev/usb/ugen.c#12 (text+ko) ====
@@ -130,20 +130,21 @@
extern cdevsw_t ugen_cdevsw;
-static void
-ugen_make_devnodes(struct ugen_softc *sc);
+/* prototypes */
-static void
-ugen_destroy_devnodes(struct ugen_softc *sc, int skip_first);
+static device_probe_t ugen_probe;
+static device_attach_t ugen_attach;
+static device_detach_t ugen_detach;
-static void
-ugen_interrupt_callback(struct usbd_xfer *xfer);
+static usbd_callback_t ugen_interrupt_callback;
+static usbd_callback_t ugenisoc_read_callback;
+static usbd_callback_t ugenisoc_write_callback;
static void
-ugenisoc_read_callback(struct usbd_xfer *xfer);
+ugen_make_devnodes(struct ugen_softc *sc);
static void
-ugenisoc_write_callback(struct usbd_xfer *xfer);
+ugen_destroy_devnodes(struct ugen_softc *sc, int skip_first);
static int
ugen_set_config(struct ugen_softc *sc, int configno);
==== //depot/projects/usb/src/sys/dev/usb/uhid.c#13 (text+ko) ====
@@ -124,6 +124,18 @@
static u_int8_t uhid_graphire_report_descr[] = { UHID_GRAPHIRE_REPORT_DESCR() };
static u_int8_t uhid_graphire3_4x5_report_descr[] = { UHID_GRAPHIRE3_4X5_REPORT_DESCR() };
+/* prototypes */
+
+static device_probe_t uhid_probe;
+static device_attach_t uhid_attach;
+static device_detach_t uhid_detach;
+
+static usbd_callback_t uhid_intr_callback;
+static usbd_callback_t uhid_intr_clear_stall_callback;
+static usbd_callback_t uhid_write_callback;
+static usbd_callback_t uhid_read_callback;
+static usbd_callback_t uhid_ioctl_callback;
+
static void
uhid_intr_callback(struct usbd_xfer *xfer)
{
@@ -586,10 +598,6 @@
return error;
}
-static device_probe_t uhid_probe;
-static device_attach_t uhid_attach;
-static device_detach_t uhid_detach;
-
static int
uhid_probe(device_t dev)
{
==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#18 (text+ko) ====
@@ -103,6 +103,19 @@
u_int8_t sc_last_status;
};
+/* prototypes */
+
+static device_probe_t ulpt_probe;
+static device_attach_t ulpt_attach;
+static device_detach_t ulpt_detach;
+
+static usbd_callback_t ulpt_write_callback;
+static usbd_callback_t ulpt_write_clear_stall_callback;
+static usbd_callback_t ulpt_read_callback;
+static usbd_callback_t ulpt_read_clear_stall_callback;
+static usbd_callback_t ulpt_status_callback;
+static usbd_callback_t ulpt_reset_callback;
+
static void
ulpt_watchdog(void *__sc)
{
@@ -489,13 +502,6 @@
return ENODEV;
}
-
-/* prototypes */
-
-static device_probe_t ulpt_probe;
-static device_attach_t ulpt_attach;
-static device_detach_t ulpt_detach;
-
static int
ulpt_probe(device_t dev)
{
==== //depot/projects/usb/src/sys/dev/usb/umass.c#12 (text+ko) ====
@@ -599,6 +599,27 @@
static device_attach_t umass_attach;
static device_detach_t umass_detach;
+static usbd_callback_t umass_tr_error;
+static usbd_callback_t umass_t_bbb_reset1_callback;
+static usbd_callback_t umass_t_bbb_reset2_callback;
+static usbd_callback_t umass_t_bbb_reset3_callback;
+static usbd_callback_t umass_t_bbb_command_callback;
+static usbd_callback_t umass_t_bbb_data_read_callback;
+static usbd_callback_t umass_t_bbb_data_rd_cs_callback;
+static usbd_callback_t umass_t_bbb_data_write_callback;
+static usbd_callback_t umass_t_bbb_data_wr_cs_callback;
+static usbd_callback_t umass_t_bbb_status_callback;
+static usbd_callback_t umass_t_cbi_reset1_callback;
+static usbd_callback_t umass_t_cbi_reset2_callback;
+static usbd_callback_t umass_t_cbi_reset3_callback;
+static usbd_callback_t umass_t_cbi_reset4_callback;
+static usbd_callback_t umass_t_cbi_command_callback;
+static usbd_callback_t umass_t_cbi_data_read_callback;
+static usbd_callback_t umass_t_cbi_data_rd_cs_callback;
+static usbd_callback_t umass_t_cbi_data_write_callback;
+static usbd_callback_t umass_t_cbi_data_wr_cs_callback;
+static usbd_callback_t umass_t_cbi_status_callback;
+
static void
umass_init_shuttle(struct umass_softc *sc);
@@ -606,40 +627,10 @@
umass_reset(struct umass_softc *sc);
static void
-umass_tr_error(struct usbd_xfer *xfer);
-
-static void
-umass_t_bbb_reset1_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_bbb_reset2_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_bbb_reset3_callback(struct usbd_xfer *xfer);
-
-static void
umass_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer,
u_int8_t next_xfer,
u_int8_t stall_xfer);
static void
-umass_t_bbb_command_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_bbb_data_read_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_bbb_data_rd_cs_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_bbb_data_write_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_bbb_data_wr_cs_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_bbb_status_callback(struct usbd_xfer *xfer);
-
-static void
umass_command_start(struct umass_softc *sc, u_int8_t dir,
void *data_ptr, u_int32_t data_len,
u_int32_t data_timeout, umass_callback_t *callback,
@@ -651,39 +642,9 @@
umass_cbi_start_status(struct umass_softc *sc);
static void
-umass_t_cbi_reset1_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_cbi_reset2_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_cbi_reset3_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_cbi_reset4_callback(struct usbd_xfer *xfer);
-
-static void
umass_t_cbi_data_clear_stall_callback(struct usbd_xfer *xfer,
u_int8_t next_xfer,
u_int8_t stall_xfer);
-static void
-umass_t_cbi_command_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_cbi_data_read_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_cbi_data_rd_cs_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_cbi_data_write_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_cbi_data_wr_cs_callback(struct usbd_xfer *xfer);
-
-static void
-umass_t_cbi_status_callback(struct usbd_xfer *xfer);
-
static int
umass_cam_attach_sim(struct umass_softc *sc);
==== //depot/projects/usb/src/sys/dev/usb/umct.c#12 (text+ko) ====
@@ -101,13 +101,20 @@
u_int8_t sc_iface_no;
};
+/* prototypes */
+
static device_probe_t umct_probe;
static device_attach_t umct_attach;
static device_detach_t umct_detach;
+static usbd_callback_t umct_intr_clear_stall_callback;
+static usbd_callback_t umct_intr_callback;
+static usbd_callback_t umct_write_callback;
+static usbd_callback_t umct_write_clear_stall_callback;
+static usbd_callback_t umct_read_callback;
+static usbd_callback_t umct_read_clear_stall_callback;
+
static void umct_cfg_do_request(struct umct_softc *sc, u_int8_t request, u_int16_t len, u_int32_t value);
-static void umct_intr_clear_stall_callback(struct usbd_xfer *xfer);
-static void umct_intr_callback(struct usbd_xfer *xfer);
static void umct_cfg_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr);
static void umct_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff);
static void umct_cfg_set_dtr(struct ucom_softc *ucom, u_int8_t onoff);
@@ -119,10 +126,6 @@
static void umct_stop_read(struct ucom_softc *ucom);
static void umct_start_write(struct ucom_softc *ucom);
static void umct_stop_write(struct ucom_softc *ucom);
-static void umct_write_callback(struct usbd_xfer *xfer);
-static void umct_write_clear_stall_callback(struct usbd_xfer *xfer);
-static void umct_read_callback(struct usbd_xfer *xfer);
-static void umct_read_clear_stall_callback(struct usbd_xfer *xfer);
static const struct usbd_config umct_config[UMCT_ENDPT_MAX] = {
==== //depot/projects/usb/src/sys/dev/usb/umodem.c#16 (text+ko) ====
@@ -161,6 +161,13 @@
static device_attach_t umodem_attach;
static device_detach_t umodem_detach;
+static usbd_callback_t umodem_intr_callback;
+static usbd_callback_t umodem_intr_clear_stall_callback;
+static usbd_callback_t umodem_write_callback;
+static usbd_callback_t umodem_read_callback;
+static usbd_callback_t umodem_write_clear_stall_callback;
+static usbd_callback_t umodem_read_clear_stall_callback;
+
static void umodem_start_read(struct ucom_softc *ucom);
static void umodem_stop_read(struct ucom_softc *ucom);
static void umodem_start_write(struct ucom_softc *ucom);
@@ -173,12 +180,6 @@
static void umodem_cfg_set_dtr(struct ucom_softc *ucom, u_int8_t onoff);
static void umodem_cfg_set_rts(struct ucom_softc *ucom, u_int8_t onoff);
static void umodem_cfg_set_break(struct ucom_softc *ucom, u_int8_t onoff);
-static void umodem_intr_callback(struct usbd_xfer *xfer);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list