PERFORCE change 129995 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Sun Dec 2 03:18:07 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=129995
Change 129995 by hselasky at hselasky_laptop001 on 2007/12/02 11:17:39
Typedefs should end by "_t". That makes the styling
job easier, hence a full C-parse will then not be
needed to understand whether an identifier is
a type or not.
[ -f src/$F ] && (cat src/$F | sed -e "s/usbd_status/usbd_status_t/g" > temp
) && ((diff -u src/$F temp) || (cat temp > src/$F))
Affected files ...
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/README#23 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.c#55 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.h#24 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#38 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#41 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.c#45 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.h#20 edit
.. //depot/projects/usb/src/sys/dev/usb/uark.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/ubser.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/ucycom.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdi.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.c#48 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.h#20 edit
.. //depot/projects/usb/src/sys/dev/usb/uhub.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/uipaq.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/umass.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/umct.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/umoscom.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/uplcom.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#10 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#62 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#64 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#59 edit
.. //depot/projects/usb/src/sys/dev/usb/uvisor.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#30 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#24 (text+ko) ====
@@ -408,7 +408,7 @@
static uint16_t
uaudio_mixer_get(struct usbd_device *udev, uint8_t what,
struct uaudio_mixer_node *mc);
-static usbd_status
+static usbd_status_t
uaudio_set_speed(struct usbd_device *udev, uint8_t endpt, uint32_t speed);
static int
@@ -1354,7 +1354,7 @@
uint8_t endpoint;
uint8_t iface_index;
uint8_t alt_index;
- usbd_status err;
+ usbd_status_t err;
ch->buf = malloc(sc->sc_buffer_size, M_DEVBUF, M_WAITOK | M_ZERO);
@@ -2949,7 +2949,7 @@
uint16_t val;
uint16_t len = MIX_SIZE(mc->type);
uint8_t data[4];
- usbd_status err;
+ usbd_status_t err;
if (mc->wValue[0] == -1) {
return (0);
@@ -3057,7 +3057,7 @@
}
}
-static usbd_status
+static usbd_status_t
uaudio_set_speed(struct usbd_device *udev, uint8_t endpt, uint32_t speed)
{
usb_device_request_t req;
==== //depot/projects/usb/src/sys/dev/usb/README#23 (text+ko) ====
@@ -130,7 +130,7 @@
/*------------------------------------------------------------------------*
- * usbd_status
+ * usbd_status_t
* usbd_transfer_setup(udev, iface_index, pxfer, setup_start,
* n_setup, priv_sc, priv_mtx)
*------------------------------------------------------------------------*/
==== //depot/projects/usb/src/sys/dev/usb/ehci.c#55 (text+ko) ====
@@ -156,7 +156,7 @@
return;
}
-usbd_status
+usbd_status_t
ehci_init(ehci_softc_t *sc)
{
struct usbd_page_search buf_res;
@@ -168,7 +168,7 @@
uint16_t x;
uint16_t y;
uint16_t bit;
- usbd_status err = 0;
+ usbd_status_t err = 0;
mtx_lock(&sc->sc_bus.mtx);
@@ -1093,7 +1093,7 @@
return (last);
}
-static usbd_status
+static usbd_status_t
ehci_non_isoc_done_sub(struct usbd_xfer *xfer)
{
ehci_qtd_t *td;
@@ -1190,12 +1190,12 @@
}
static void
- ehci_device_done(struct usbd_xfer *xfer, usbd_status error);
+ ehci_device_done(struct usbd_xfer *xfer, usbd_status_t error);
static void
ehci_non_isoc_done(struct usbd_xfer *xfer)
{
- usbd_status err = 0;
+ usbd_status_t err = 0;
DPRINTFN(12, ("xfer=%p pipe=%p transfer done\n",
xfer, xfer->pipe));
@@ -2146,7 +2146,7 @@
* from close and from interrupt
*/
static void
-ehci_device_done(struct usbd_xfer *xfer, usbd_status error)
+ehci_device_done(struct usbd_xfer *xfer, usbd_status_t error)
{
struct usbd_pipe_methods *methods = xfer->pipe->methods;
ehci_softc_t *sc = xfer->usb_sc;
==== //depot/projects/usb/src/sys/dev/usb/ehci.h#24 (text+ko) ====
@@ -503,7 +503,7 @@
usbd_bus_mem_cb_t ehci_iterate_hw_softc;
-usbd_status ehci_init(ehci_softc_t *sc);
+usbd_status_t ehci_init(ehci_softc_t *sc);
void ehci_detach(struct ehci_softc *sc);
void ehci_suspend(struct ehci_softc *sc);
void ehci_resume(struct ehci_softc *sc);
==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#37 (text+ko) ====
@@ -379,7 +379,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
if (usbd_config_td_is_gone(&(sc->sc_config_td))) {
goto error;
==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#38 (text+ko) ====
@@ -331,7 +331,7 @@
uint16_t val, void *buf)
{
usb_device_request_t req;
- usbd_status err;
+ usbd_status_t err;
uint16_t length = AXE_CMD_LEN(cmd);
req.bmRequestType = (AXE_CMD_IS_WRITE(cmd) ?
@@ -580,7 +580,7 @@
static void
axe_cfg_reset(struct axe_softc *sc)
{
- usbd_status err;
+ usbd_status_t err;
err = usbreq_set_config(sc->sc_udev, &(sc->sc_mtx), AXE_CONFIG_NO);
==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#33 (text+ko) ====
@@ -232,7 +232,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
if (usbd_config_td_is_gone(&(sc->sc_config_td))) {
goto error;
==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#35 (text+ko) ====
@@ -274,7 +274,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
if (usbd_config_td_is_gone(&(sc->sc_config_td))) {
goto error;
@@ -453,7 +453,7 @@
static void
kue_cfg_reset(struct kue_softc *sc)
{
- usbd_status err;
+ usbd_status_t err;
err = usbreq_set_config(sc->sc_udev, &(sc->sc_mtx), KUE_CONFIG_NO);
==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#33 (text+ko) ====
@@ -311,7 +311,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
if (usbd_config_td_is_gone(&(sc->sc_config_td))) {
goto error;
@@ -633,7 +633,7 @@
static void
rue_cfg_reset(struct rue_softc *sc)
{
- usbd_status err;
+ usbd_status_t err;
uint16_t to;
rue_cfg_csr_write_1(sc, RUE_CR, RUE_CR_SOFT_RST);
==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#17 (text+ko) ====
@@ -554,7 +554,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
repeat:
==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#34 (text+ko) ====
@@ -489,7 +489,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
if (usbd_config_td_is_gone(&(sc->sc_config_td))) {
goto error;
@@ -711,7 +711,7 @@
static void
udav_cfg_reset(struct udav_softc *sc)
{
- usbd_status err;
+ usbd_status_t err;
uint16_t to;
/* Select PHY */
==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#41 (text+ko) ====
@@ -617,7 +617,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
repeat:
==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#23 (text+ko) ====
@@ -380,7 +380,7 @@
uint16_t value, uint16_t index, uint16_t length, uint8_t *data)
{
usb_device_request_t req;
- usbd_status err;
+ usbd_status_t err;
req.bmRequestType = type;
req.bRequest = request;
@@ -429,7 +429,7 @@
static void
zyd_cfg_reset(struct zyd_softc *sc)
{
- usbd_status err;
+ usbd_status_t err;
err = usbreq_set_config(sc->sc_udev, &(sc->sc_mtx), ZYD_CONFIG_NO);
==== //depot/projects/usb/src/sys/dev/usb/ohci.c#45 (text+ko) ====
@@ -123,7 +123,7 @@
static usbd_config_td_command_t ohci_root_ctrl_task;
static void ohci_root_ctrl_task_td(struct ohci_softc *sc, struct thread *ctd);
static void ohci_do_poll(struct usbd_bus *bus);
-static void ohci_device_done(struct usbd_xfer *xfer, usbd_status error);
+static void ohci_device_done(struct usbd_xfer *xfer, usbd_status_t error);
static usbd_std_root_transfer_func_t ohci_root_intr_done;
static usbd_std_root_transfer_func_t ohci_root_ctrl_task_td_sub;
@@ -172,7 +172,7 @@
return;
}
-static usbd_status
+static usbd_status_t
ohci_controller_init(ohci_softc_t *sc)
{
struct usbd_page_search buf_res;
@@ -324,7 +324,7 @@
return (ed);
}
-usbd_status
+usbd_status_t
ohci_init(ohci_softc_t *sc)
{
struct usbd_page_search buf_res;
@@ -848,7 +848,7 @@
#endif
-static usbd_status
+static usbd_status_t
ohci_non_isoc_done_sub(struct usbd_xfer *xfer)
{
ohci_td_t *td;
@@ -936,7 +936,7 @@
static void
ohci_non_isoc_done(struct usbd_xfer *xfer)
{
- usbd_status err = 0;
+ usbd_status_t err = 0;
DPRINTFN(12, ("xfer=%p pipe=%p transfer done\n",
xfer, xfer->pipe));
@@ -1728,7 +1728,7 @@
* from close and from interrupt
*/
static void
-ohci_device_done(struct usbd_xfer *xfer, usbd_status error)
+ohci_device_done(struct usbd_xfer *xfer, usbd_status_t error)
{
struct usbd_pipe_methods *methods = xfer->pipe->methods;
ohci_softc_t *sc = xfer->usb_sc;
==== //depot/projects/usb/src/sys/dev/usb/ohci.h#20 (text+ko) ====
@@ -356,7 +356,7 @@
usbd_bus_mem_cb_t ohci_iterate_hw_softc;
-usbd_status ohci_init(ohci_softc_t *sc);
+usbd_status_t ohci_init(ohci_softc_t *sc);
void ohci_detach(struct ohci_softc *sc);
void ohci_suspend(ohci_softc_t *sc);
void ohci_resume(ohci_softc_t *sc);
==== //depot/projects/usb/src/sys/dev/usb/uark.c#13 (text+ko) ====
@@ -485,7 +485,7 @@
uark_cfg_write(struct uark_softc *sc, uint16_t index, uint16_t value)
{
usb_device_request_t req;
- usbd_status err;
+ usbd_status_t err;
if (ucom_cfg_is_gone(&(sc->sc_ucom))) {
return;
==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#30 (text+ko) ====
@@ -415,7 +415,7 @@
ubsa_cfg_request(struct ubsa_softc *sc, uint8_t index, uint16_t value)
{
usb_device_request_t req;
- usbd_status err;
+ usbd_status_t err;
if (ucom_cfg_is_gone(&(sc->sc_ucom))) {
return;
==== //depot/projects/usb/src/sys/dev/usb/ubser.c#22 (text+ko) ====
@@ -543,7 +543,7 @@
struct ubser_softc *sc = ucom->sc_parent;
uint8_t x = ucom->sc_portno;
usb_device_request_t req;
- usbd_status err;
+ usbd_status_t err;
if (onoff) {
==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#24 (text+ko) ====
@@ -453,7 +453,7 @@
{
usb_device_request_t req;
uint16_t len;
- usbd_status err;
+ usbd_status_t err;
len = sc->sc_flen;
if (len > sizeof(sc->sc_temp_cfg)) {
==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#30 (text+ko) ====
@@ -479,7 +479,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
if (ucom_cfg_is_gone(&(sc->sc_ucom))) {
goto error;
==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#27 (text+ko) ====
@@ -469,7 +469,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
if (ucom_cfg_is_gone(&(sc->sc_ucom))) {
goto error;
==== //depot/projects/usb/src/sys/dev/usb/ugen.c#29 (text+ko) ====
@@ -313,7 +313,7 @@
return;
}
-static usbd_status
+static usbd_status_t
ugen_allocate_blocks(struct ugen_softc *sc,
struct ugen_endpoint *sce,
struct ugen_frame_ring *ufr,
@@ -360,7 +360,7 @@
return;
}
-static usbd_status
+static usbd_status_t
__usbd_transfer_setup(struct ugen_softc *sc,
struct ugen_endpoint *sce,
uint16_t context_bit,
@@ -374,7 +374,7 @@
{
struct usbd_xfer *temp[n_setup];
- usbd_status error;
+ usbd_status_t error;
if ((n_out_frames > 0) && (n_in_frames > 0)) {
/* should not happen */
@@ -584,7 +584,7 @@
static int
ugen_open_pipe_write(struct ugen_softc *sc, struct ugen_endpoint *sce)
{
- usbd_status err;
+ usbd_status_t err;
mtx_assert(&sc->sc_mtx, MA_OWNED);
@@ -669,7 +669,7 @@
static int
ugen_open_pipe_read(struct ugen_softc *sc, struct ugen_endpoint *sce)
{
- usbd_status err;
+ usbd_status_t err;
mtx_assert(&sc->sc_mtx, MA_OWNED);
==== //depot/projects/usb/src/sys/dev/usb/uhci.c#48 (text+ko) ====
@@ -160,7 +160,7 @@
static usbd_config_td_command_t uhci_root_ctrl_task;
static void uhci_root_ctrl_task_td(struct uhci_softc *sc, struct thread *ctd);
static void uhci_do_poll(struct usbd_bus *bus);
-static void uhci_device_done(struct usbd_xfer *xfer, usbd_status error);
+static void uhci_device_done(struct usbd_xfer *xfer, usbd_status_t error);
void
uhci_iterate_hw_softc(struct usbd_bus *bus, usbd_bus_mem_sub_cb_t *cb)
@@ -423,7 +423,7 @@
return (td);
}
-usbd_status
+usbd_status_t
uhci_init(uhci_softc_t *sc)
{
uint16_t bit;
@@ -1110,7 +1110,7 @@
return (need_delay);
}
-static usbd_status
+static usbd_status_t
uhci_non_isoc_done_sub(struct usbd_xfer *xfer)
{
struct usbd_page_search res;
@@ -1226,7 +1226,7 @@
static void
uhci_non_isoc_done(struct usbd_xfer *xfer)
{
- usbd_status err = 0;
+ usbd_status_t err = 0;
DPRINTFN(12, ("xfer=%p pipe=%p transfer done\n",
xfer, xfer->pipe));
@@ -1942,7 +1942,7 @@
*/
static void
-uhci_device_done(struct usbd_xfer *xfer, usbd_status error)
+uhci_device_done(struct usbd_xfer *xfer, usbd_status_t error)
{
struct usbd_pipe_methods *methods = xfer->pipe->methods;
uhci_softc_t *sc = xfer->usb_sc;
@@ -2562,7 +2562,7 @@
* outstanding "port enable change" and "connection status change"
* events have been reset.
*/
-static usbd_status
+static usbd_status_t
uhci_portreset(uhci_softc_t *sc, uint16_t index, uint8_t use_polling)
{
uint16_t port;
==== //depot/projects/usb/src/sys/dev/usb/uhci.h#20 (text+ko) ====
@@ -311,7 +311,7 @@
usbd_bus_mem_cb_t uhci_iterate_hw_softc;
-usbd_status uhci_init(uhci_softc_t *sc);
+usbd_status_t uhci_init(uhci_softc_t *sc);
void uhci_suspend(uhci_softc_t *sc);
void uhci_resume(uhci_softc_t *sc);
void uhci_reset(uhci_softc_t *sc);
==== //depot/projects/usb/src/sys/dev/usb/uhub.c#22 (text+ko) ====
@@ -214,12 +214,12 @@
return (udev->bus->devices[up->device_addr]);
}
-static usbd_status
+static usbd_status_t
uhub_explore_sub(device_t dev, struct usbd_device *udev, struct usbd_port *up)
{
struct usbd_device *child;
uint8_t refcount = usb_driver_added_refcount;
- usbd_status err = 0;
+ usbd_status_t err = 0;
child = uhub_port_to_sub_device(udev, up);
@@ -241,14 +241,14 @@
return (err);
}
-static usbd_status
+static usbd_status_t
uhub_explore(struct usbd_device *udev)
{
usb_hub_descriptor_t *hd = &udev->hub->hubdesc;
struct uhub_softc *sc = udev->hub->hubsoftc;
struct usbd_device *child;
struct usbd_port *up;
- usbd_status err;
+ usbd_status_t err;
uint16_t change;
uint16_t status;
uint8_t portno;
@@ -455,7 +455,7 @@
uint8_t nports;
uint8_t portno;
uint8_t removable;
- usbd_status err;
+ usbd_status_t err;
if (sc == NULL) {
return (ENOMEM);
==== //depot/projects/usb/src/sys/dev/usb/uipaq.c#13 (text+ko) ====
@@ -305,7 +305,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
if (ucom_cfg_is_gone(&(sc->sc_ucom))) {
goto error;
==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#30 (text+ko) ====
@@ -608,7 +608,7 @@
struct usb_attach_arg *uaa = device_get_ivars(dev);
int32_t unit = device_get_unit(dev);
keyboard_t *kbd = &(sc->sc_kbd);
- usbd_status err;
+ usbd_status_t err;
uint16_t n;
if (sc == NULL) {
==== //depot/projects/usb/src/sys/dev/usb/umass.c#35 (text+ko) ====
@@ -1630,7 +1630,7 @@
umass_init_shuttle(struct umass_softc *sc)
{
usb_device_request_t req;
- usbd_status err;
+ usbd_status_t err;
uint8_t status[2] = {0, 0};
/*
@@ -2161,7 +2161,7 @@
umass_bbb_get_max_lun(struct umass_softc *sc)
{
usb_device_request_t req;
- usbd_status err;
+ usbd_status_t err;
uint8_t buf = 0;
/* The Get Max Lun command is a class-specific request. */
==== //depot/projects/usb/src/sys/dev/usb/umct.c#24 (text+ko) ====
@@ -357,7 +357,7 @@
uint16_t len, uint32_t value)
{
usb_device_request_t req;
- usbd_status err;
+ usbd_status_t err;
uint8_t temp[4];
if (ucom_cfg_is_gone(&(sc->sc_ucom))) {
==== //depot/projects/usb/src/sys/dev/usb/umodem.c#33 (text+ko) ====
@@ -183,7 +183,7 @@
static void umodem_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff);
static void umodem_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff);
static void *umodem_get_desc(struct usb_attach_arg *uaa, uint8_t type, uint8_t subtype);
-static usbd_status umodem_set_comm_feature(struct usbd_device *udev, uint8_t iface_no, uint16_t feature, uint16_t state);
+static usbd_status_t umodem_set_comm_feature(struct usbd_device *udev, uint8_t iface_no, uint16_t feature, uint16_t state);
static void umodem_cfg_do_request(struct umodem_softc *sc, usb_device_request_t *req, void *data);
static const struct usbd_config umodem_config_data[UMODEM_N_DATA_TRANSFER] = {
@@ -879,7 +879,7 @@
type, 0 - 1, subtype, 0 - 1);
}
-static usbd_status
+static usbd_status_t
umodem_set_comm_feature(struct usbd_device *udev, uint8_t iface_no,
uint16_t feature, uint16_t state)
{
@@ -921,7 +921,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
if (ucom_cfg_is_gone(&(sc->sc_ucom))) {
goto error;
==== //depot/projects/usb/src/sys/dev/usb/umoscom.c#11 (text+ko) ====
@@ -584,7 +584,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
if (ucom_cfg_is_gone(&(sc->sc_ucom)))
goto error;
==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#31 (text+ko) ====
@@ -168,7 +168,7 @@
static const struct uplcom_product *uplcom_find_up(struct usb_attach_arg *uaa);
-static usbd_status uplcom_reset(struct uplcom_softc *sc, struct usbd_device *udev);
+static usbd_status_t uplcom_reset(struct uplcom_softc *sc, struct usbd_device *udev);
static int uplcom_pl2303x_init(struct usbd_device *udev);
static void uplcom_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff);
static void uplcom_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff);
@@ -516,7 +516,7 @@
return (0);
}
-static usbd_status
+static usbd_status_t
uplcom_reset(struct uplcom_softc *sc, struct usbd_device *udev)
{
usb_device_request_t req;
@@ -559,7 +559,7 @@
uplcom_pl2303x_init(struct usbd_device *udev)
{
usb_device_request_t req;
- usbd_status err;
+ usbd_status_t err;
int i;
for (i = 0; i < N_PL2302X_INIT; i++) {
@@ -968,7 +968,7 @@
void *data)
{
uint16_t length;
- usbd_status err;
+ usbd_status_t err;
if (ucom_cfg_is_gone(&(sc->sc_ucom))) {
goto error;
==== //depot/projects/usb/src/sys/dev/usb/usb.c#24 (text+ko) ====
@@ -302,7 +302,7 @@
usb_attach_sub(device_t dev, struct usbd_bus *bus)
{
dev_clone_fn usb_clone_ptr = &usb_clone;
- usbd_status err;
+ usbd_status_t err;
uint8_t speed;
PRINTF(("\n"));
==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#10 (text+ko) ====
@@ -488,14 +488,14 @@
return (NULL);
}
-usbd_status
+usbd_status_t
hid_read_report_desc_from_usb(struct usbd_device *udev, struct mtx *mtx,
void **descp, uint16_t *sizep,
usb_malloc_type mem, uint8_t iface_index)
{
struct usbd_interface *iface = usbd_get_iface(udev, iface_index);
usb_hid_descriptor_t *hid;
- usbd_status err;
+ usbd_status_t err;
if ((iface == NULL) || (iface->idesc == NULL)) {
return (USBD_INVAL);
==== //depot/projects/usb/src/sys/dev/usb/usb_hid.h#10 (text+ko) ====
@@ -236,7 +236,7 @@
u_long hid_get_data(const u_char *buf, uint32_t len, struct hid_location *loc);
int hid_is_collection(const void *desc, int size, uint32_t usage);
usb_hid_descriptor_t *hid_get_descriptor_from_usb(usb_config_descriptor_t *cd, usb_interface_descriptor_t *id);
-usbd_status hid_read_report_desc_from_usb(struct usbd_device *udev, struct mtx *mtx, void **descp, uint16_t *sizep, usb_malloc_type mem, uint8_t iface_index);
+usbd_status_t hid_read_report_desc_from_usb(struct usbd_device *udev, struct mtx *mtx, void **descp, uint16_t *sizep, usb_malloc_type mem, uint8_t iface_index);
#endif
==== //depot/projects/usb/src/sys/dev/usb/usb_requests.c#11 (text+ko) ====
@@ -53,12 +53,12 @@
/*------------------------------------------------------------------------*
* usbreq_reset_port
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_reset_port(struct usbd_device *udev, struct mtx *mtx,
usb_port_status_t *ps, uint8_t port)
{
usb_device_request_t req;
- usbd_status err;
+ usbd_status_t err;
uint8_t n;
req.bmRequestType = UT_WRITE_CLASS_OTHER;
@@ -116,7 +116,7 @@
/*------------------------------------------------------------------------*
* usbreq_get_desc
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_get_desc(struct usbd_device *udev, struct mtx *mtx, void *desc,
uint16_t min_len, uint16_t max_len,
uint16_t id, uint8_t type, uint8_t index,
@@ -124,7 +124,7 @@
{
usb_device_request_t req;
uint8_t *buf;
- usbd_status err;
+ usbd_status_t err;
PRINTFN(3, ("id=%d, type=%d, index=%d, max_len=%d\n",
id, type, index, max_len));
@@ -195,7 +195,7 @@
* the terminating zero. The "len" argument should be twice as
* big pluss 2 bytes, compared with the actual maximum string length !
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_get_string_any(struct usbd_device *udev, struct mtx *mtx, char *buf,
uint16_t len, uint8_t string_index)
{
@@ -205,7 +205,7 @@
uint16_t n;
uint16_t c;
uint8_t swap;
- usbd_status err;
+ usbd_status_t err;
if (len == 0) {
/* should not happen */
@@ -275,7 +275,7 @@
* If you don't know the language ID, consider using
* "usbreq_get_string_any()".
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_get_string_desc(struct usbd_device *udev, struct mtx *mtx, void *sdesc,
uint16_t max_len, uint16_t lang_id,
uint8_t string_index)
@@ -287,11 +287,11 @@
/*------------------------------------------------------------------------*
* usbreq_get_config_desc
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_get_config_desc(struct usbd_device *udev, struct mtx *mtx, usb_config_descriptor_t *d,
uint8_t conf_index)
{
- usbd_status err;
+ usbd_status_t err;
PRINTFN(3, ("confidx=%d\n", conf_index));
@@ -310,7 +310,7 @@
/*------------------------------------------------------------------------*
* usbreq_get_config_desc_full
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_get_config_desc_full(struct usbd_device *udev, struct mtx *mtx, void *d,
uint16_t size, uint8_t conf_index)
{
@@ -322,7 +322,7 @@
/*------------------------------------------------------------------------*
* usbreq_get_device_desc
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_get_device_desc(struct usbd_device *udev, struct mtx *mtx,
usb_device_descriptor_t *d)
{
@@ -334,7 +334,7 @@
/*------------------------------------------------------------------------*
* usbreq_get_alt_interface_no
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_get_alt_interface_no(struct usbd_device *udev, struct mtx *mtx,
uint8_t *alt_iface_no, uint8_t iface_index)
{
@@ -356,7 +356,7 @@
/*------------------------------------------------------------------------*
* usbreq_set_alt_interface_no
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_set_alt_interface_no(struct usbd_device *udev, struct mtx *mtx,
uint8_t iface_index, uint8_t alt_no)
{
@@ -379,7 +379,7 @@
/*------------------------------------------------------------------------*
* usbreq_get_device_status
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_get_device_status(struct usbd_device *udev, struct mtx *mtx,
usb_status_t *st)
{
@@ -396,7 +396,7 @@
/*------------------------------------------------------------------------*
* usbreq_get_hub_descriptor
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_get_hub_descriptor(struct usbd_device *udev, struct mtx *mtx,
usb_hub_descriptor_t *hd)
{
@@ -413,7 +413,7 @@
/*------------------------------------------------------------------------*
* usbreq_get_hub_status
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_get_hub_status(struct usbd_device *udev, struct mtx *mtx,
usb_hub_status_t *st)
{
@@ -430,7 +430,7 @@
/*------------------------------------------------------------------------*
* usbreq_set_address
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_set_address(struct usbd_device *udev, struct mtx *mtx, uint16_t addr)
{
usb_device_request_t req;
@@ -448,7 +448,7 @@
/*------------------------------------------------------------------------*
* usbreq_get_port_status
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_get_port_status(struct usbd_device *udev, struct mtx *mtx,
usb_port_status_t *ps, uint8_t port)
{
@@ -466,7 +466,7 @@
/*------------------------------------------------------------------------*
* usbreq_clear_hub_feature
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_clear_hub_feature(struct usbd_device *udev, struct mtx *mtx,
uint16_t sel)
{
@@ -483,7 +483,7 @@
/*------------------------------------------------------------------------*
* usbreq_set_hub_feature
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_set_hub_feature(struct usbd_device *udev, struct mtx *mtx,
uint16_t sel)
{
@@ -500,7 +500,7 @@
/*------------------------------------------------------------------------*
* usbreq_clear_port_feature
*------------------------------------------------------------------------*/
-usbd_status
+usbd_status_t
usbreq_clear_port_feature(struct usbd_device *udev, struct mtx *mtx,
uint8_t port, uint16_t sel)
{
@@ -518,7 +518,7 @@
/*------------------------------------------------------------------------*
* usbreq_set_port_feature
*------------------------------------------------------------------------*/
-usbd_status
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list