PERFORCE change 127069 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Mon Oct 1 11:30:35 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127069
Change 127069 by hselasky at hselasky_laptop001 on 2007/10/01 18:30:27
Style change;
- substitute all "u_intXXX" by "uintXXX"
Done by the following script kernel;
[ -f src/$F ] && (((cat src/$F | sed -e "s/u_int32_t/uint32_t/g" |
sed -e "s/u_int16_t/uint16_t/g" |
sed -e "s/u_int8_t/uint8_t/g" > temp) &&
(diff -u src/$F temp > /dev/null)) || (cp temp src/$F))
Affected files ...
.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#17 edit
.. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#6 edit
.. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.h#6 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#16 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.h#5 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio_pcm.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.c#42 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.h#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/ubser.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/ucom.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/ucycom.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/ufm.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdi.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/ugensa.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.h#12 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/uhid.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/umass.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/umct.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/uplcom.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/urio.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.h#15 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#6 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#44 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/uvisor.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#23 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#14 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#8 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#9 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#17 (text) ====
@@ -52,30 +52,30 @@
/* Command Block Wrapper */
struct bbb_cbw {
- u_int8_t signature[4];
+ uint8_t signature[4];
#define CBWSIGNATURE 0x43425355
- u_int8_t tag[4];
- u_int8_t transfer_length[4];
- u_int8_t flags;
+ uint8_t tag[4];
+ uint8_t transfer_length[4];
+ uint8_t flags;
#define CBWFLAGS_OUT 0x00
#define CBWFLAGS_IN 0x80
- u_int8_t lun;
- u_int8_t length;
+ uint8_t lun;
+ uint8_t length;
#define CBWCDBLENGTH 16
- u_int8_t cdb[CBWCDBLENGTH];
+ uint8_t cdb[CBWCDBLENGTH];
} UPACKED;
/* Command Status Wrapper */
struct bbb_csw {
- u_int8_t signature[4];
+ uint8_t signature[4];
#define CSWSIGNATURE 0x53425355
- u_int8_t tag[4];
- u_int8_t residue[4];
- u_int8_t status;
+ uint8_t tag[4];
+ uint8_t residue[4];
+ uint8_t status;
#define CSWSTATUS_GOOD 0x0
#define CSWSTATUS_FAILED 0x1
#define CSWSTATUS_PHASE 0x2
@@ -108,16 +108,16 @@
caddr_t ata_data;
device_t dev;
- u_int32_t timeout;
- u_int32_t ata_donecount;
- u_int32_t ata_bytecount;
+ uint32_t timeout;
+ uint32_t ata_donecount;
+ uint32_t ata_bytecount;
- u_int8_t last_xfer_no;
- u_int8_t usb_speed;
- u_int8_t intr_stalled;
- u_int8_t maxlun;
- u_int8_t iface_no;
- u_int8_t status_try;
+ uint8_t last_xfer_no;
+ uint8_t usb_speed;
+ uint8_t intr_stalled;
+ uint8_t maxlun;
+ uint8_t iface_no;
+ uint8_t status_try;
};
static const int atausbdebug = 0;
@@ -142,12 +142,12 @@
static void atausb_cancel_request(struct atausb_softc *sc);
static void
-atausb_transfer_start(struct atausb_softc *sc, u_int8_t xfer_no);
+atausb_transfer_start(struct atausb_softc *sc, uint8_t xfer_no);
static void
atausb_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer,
- u_int8_t next_xfer,
- u_int8_t stall_xfer);
+ uint8_t next_xfer,
+ uint8_t stall_xfer);
static int
ata_usbchannel_begin_transaction(struct ata_request *request);
@@ -325,9 +325,9 @@
usb_interface_descriptor_t *id;
const char *proto, *subclass;
usb_device_request_t request;
- u_int16_t i;
- u_int8_t maxlun;
- u_int8_t has_intr;
+ uint16_t i;
+ uint8_t maxlun;
+ uint8_t has_intr;
int err;
if (sc == NULL) {
@@ -462,7 +462,7 @@
}
static void
-atausb_transfer_start(struct atausb_softc *sc, u_int8_t xfer_no)
+atausb_transfer_start(struct atausb_softc *sc, uint8_t xfer_no)
{
if (atausbdebug) {
device_printf(sc->dev, "BBB transfer %d\n", xfer_no);
@@ -528,8 +528,8 @@
static void
atausb_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer,
- u_int8_t next_xfer,
- u_int8_t stall_xfer)
+ uint8_t next_xfer,
+ uint8_t stall_xfer)
{
struct atausb_softc *sc = xfer->priv_sc;
@@ -556,7 +556,7 @@
struct atausb_softc *sc = xfer->priv_sc;
struct ata_request *request = sc->ata_request;
struct ata_channel *ch;
- u_int32_t tag;
+ uint32_t tag;
USBD_CHECK_STATUS(xfer);
@@ -603,7 +603,7 @@
atausb_t_bbb_data_read_callback(struct usbd_xfer *xfer)
{
struct atausb_softc *sc = xfer->priv_sc;
- u_int32_t max_bulk = xfer->max_data_length;
+ uint32_t max_bulk = xfer->max_data_length;
USBD_CHECK_STATUS(xfer);
@@ -664,7 +664,7 @@
atausb_t_bbb_data_write_callback(struct usbd_xfer *xfer)
{
struct atausb_softc *sc = xfer->priv_sc;
- u_int32_t max_bulk = xfer->max_data_length;
+ uint32_t max_bulk = xfer->max_data_length;
USBD_CHECK_STATUS(xfer);
@@ -721,7 +721,7 @@
{
struct atausb_softc *sc = xfer->priv_sc;
struct ata_request *request = sc->ata_request;
- u_int32_t residue;
+ uint32_t residue;
USBD_CHECK_STATUS(xfer);
@@ -867,17 +867,17 @@
* ATA backend part
*/
struct atapi_inquiry {
- u_int8_t device_type;
- u_int8_t device_modifier;
- u_int8_t version;
- u_int8_t response_format;
- u_int8_t length;
- u_int8_t reserved[2];
- u_int8_t flags;
- u_int8_t vendor[8];
- u_int8_t product[16];
- u_int8_t revision[4];
- /* u_int8_t crap[60]; */
+ uint8_t device_type;
+ uint8_t device_modifier;
+ uint8_t version;
+ uint8_t response_format;
+ uint8_t length;
+ uint8_t reserved[2];
+ uint8_t flags;
+ uint8_t vendor[8];
+ uint8_t product[16];
+ uint8_t revision[4];
+ /* uint8_t crap[60]; */
} UPACKED;
static int
@@ -958,7 +958,7 @@
(request->u.atapi.ccb[0] == ATAPI_INQUIRY)) {
struct ata_device *atadev = device_get_softc(request->dev);
struct atapi_inquiry *inquiry = (struct atapi_inquiry *)request->data;
- u_int16_t *ptr;
+ uint16_t *ptr;
/* convert inquiry data into simple ata_param like format */
atadev->param.config = ATA_PROTO_ATAPI | ATA_PROTO_ATAPI_12;
@@ -967,13 +967,13 @@
strncpy(atadev->param.model, inquiry->vendor, 8);
strcpy(atadev->param.model, " ");
strncpy(atadev->param.model, inquiry->product, 16);
- ptr = (u_int16_t*)(atadev->param.model + sizeof(atadev->param.model));
- while (--ptr >= (u_int16_t*)atadev->param.model) {
+ ptr = (uint16_t*)(atadev->param.model + sizeof(atadev->param.model));
+ while (--ptr >= (uint16_t*)atadev->param.model) {
*ptr = ntohs(*ptr);
}
strncpy(atadev->param.revision, inquiry->revision, 4);
- ptr=(u_int16_t*)(atadev->param.revision+sizeof(atadev->param.revision));
- while (--ptr >= (u_int16_t*)atadev->param.revision) {
+ ptr=(uint16_t*)(atadev->param.revision+sizeof(atadev->param.revision));
+ while (--ptr >= (uint16_t*)atadev->param.revision) {
*ptr = ntohs(*ptr);
}
request->result = 0;
==== //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#6 (text+ko) ====
@@ -42,14 +42,14 @@
int hwvol_step;
int type;
device_t dev;
- u_int32_t hwvol_mute_level;
- u_int32_t devs;
- u_int32_t recdevs;
- u_int32_t recsrc;
- u_int16_t level[32];
- u_int8_t parent[32];
- u_int32_t child[32];
- u_int8_t realdev[32];
+ uint32_t hwvol_mute_level;
+ uint32_t devs;
+ uint32_t recdevs;
+ uint32_t recsrc;
+ uint16_t level[32];
+ uint8_t parent[32];
+ uint32_t child[32];
+ uint8_t realdev[32];
char name[MIXER_NAMELEN];
struct mtx *lock;
oss_mixer_enuminfo enuminfo;
@@ -61,7 +61,7 @@
int modify_counter;
};
-static u_int16_t snd_mixerdefaults[SOUND_MIXER_NRDEVICES] = {
+static uint16_t snd_mixerdefaults[SOUND_MIXER_NRDEVICES] = {
[SOUND_MIXER_VOLUME] = 75,
[SOUND_MIXER_BASS] = 50,
[SOUND_MIXER_TREBLE] = 50,
@@ -195,8 +195,8 @@
{
struct snddev_info *d;
unsigned l, r, tl, tr;
- u_int32_t parent = SOUND_MIXER_NONE, child = 0;
- u_int32_t realdev;
+ uint32_t parent = SOUND_MIXER_NONE, child = 0;
+ uint32_t realdev;
int i, dropmtx;
if (m == NULL || dev >= SOUND_MIXER_NRDEVICES ||
@@ -281,7 +281,7 @@
}
static int
-mixer_setrecsrc(struct snd_mixer *mixer, u_int32_t src)
+mixer_setrecsrc(struct snd_mixer *mixer, uint32_t src)
{
struct snddev_info *d;
int dropmtx;
@@ -387,7 +387,7 @@
}
void
-mix_setdevs(struct snd_mixer *m, u_int32_t v)
+mix_setdevs(struct snd_mixer *m, uint32_t v)
{
struct snddev_info *d;
int i;
@@ -425,7 +425,7 @@
* @param v mask of recording devices
*/
void
-mix_setrecdevs(struct snd_mixer *m, u_int32_t v)
+mix_setrecdevs(struct snd_mixer *m, uint32_t v)
{
oss_mixer_enuminfo *ei;
char *loc;
@@ -475,9 +475,9 @@
}
void
-mix_setparentchild(struct snd_mixer *m, u_int32_t parent, u_int32_t childs)
+mix_setparentchild(struct snd_mixer *m, uint32_t parent, uint32_t childs)
{
- u_int32_t mask = 0;
+ uint32_t mask = 0;
int i;
if (m == NULL || parent >= SOUND_MIXER_NRDEVICES)
@@ -498,7 +498,7 @@
}
void
-mix_setrealdev(struct snd_mixer *m, u_int32_t dev, u_int32_t realdev)
+mix_setrealdev(struct snd_mixer *m, uint32_t dev, uint32_t realdev)
{
if (m == NULL || dev >= SOUND_MIXER_NRDEVICES ||
!(realdev == SOUND_MIXER_NONE || realdev < SOUND_MIXER_NRDEVICES))
@@ -506,29 +506,29 @@
m->realdev[dev] = realdev;
}
-u_int32_t
-mix_getparent(struct snd_mixer *m, u_int32_t dev)
+uint32_t
+mix_getparent(struct snd_mixer *m, uint32_t dev)
{
if (m == NULL || dev >= SOUND_MIXER_NRDEVICES)
return SOUND_MIXER_NONE;
return m->parent[dev];
}
-u_int32_t
-mix_getchild(struct snd_mixer *m, u_int32_t dev)
+uint32_t
+mix_getchild(struct snd_mixer *m, uint32_t dev)
{
if (m == NULL || dev >= SOUND_MIXER_NRDEVICES)
return 0;
return m->child[dev];
}
-u_int32_t
+uint32_t
mix_getdevs(struct snd_mixer *m)
{
return m->devs;
}
-u_int32_t
+uint32_t
mix_getrecdevs(struct snd_mixer *m)
{
return m->recdevs;
@@ -619,7 +619,7 @@
{
struct snddev_info *snddev;
struct snd_mixer *m;
- u_int16_t v;
+ uint16_t v;
struct cdev *pdev;
int i, unit, devunit, val;
@@ -633,7 +633,7 @@
if (resource_int_value(device_get_name(dev),
device_get_unit(dev), snd_mixernames[i], &val) == 0) {
if (val >= 0 && val <= 100) {
- v = (u_int16_t) val;
+ v = (uint16_t) val;
}
}
@@ -893,7 +893,7 @@
}
int
-mix_setrecsrc(struct snd_mixer *m, u_int32_t src)
+mix_setrecsrc(struct snd_mixer *m, uint32_t src)
{
int ret;
@@ -906,10 +906,10 @@
return ((ret != 0) ? ENXIO : 0);
}
-u_int32_t
+uint32_t
mix_getrecsrc(struct snd_mixer *m)
{
- u_int32_t ret;
+ uint32_t ret;
KASSERT(m != NULL, ("NULL snd_mixer"));
==== //depot/projects/usb/src/sys/dev/sound/pcm/mixer.h#6 (text+ko) ====
@@ -43,18 +43,18 @@
int mix_set(struct snd_mixer *m, u_int dev, u_int left, u_int right);
int mix_get(struct snd_mixer *m, u_int dev);
-int mix_setrecsrc(struct snd_mixer *m, u_int32_t src);
-u_int32_t mix_getrecsrc(struct snd_mixer *m);
+int mix_setrecsrc(struct snd_mixer *m, uint32_t src);
+uint32_t mix_getrecsrc(struct snd_mixer *m);
int mix_get_type(struct snd_mixer *m);
-void mix_setdevs(struct snd_mixer *m, u_int32_t v);
-void mix_setrecdevs(struct snd_mixer *m, u_int32_t v);
-u_int32_t mix_getdevs(struct snd_mixer *m);
-u_int32_t mix_getrecdevs(struct snd_mixer *m);
-void mix_setparentchild(struct snd_mixer *m, u_int32_t parent, u_int32_t childs);
-void mix_setrealdev(struct snd_mixer *m, u_int32_t dev, u_int32_t realdev);
-u_int32_t mix_getparent(struct snd_mixer *m, u_int32_t dev);
-u_int32_t mix_getchild(struct snd_mixer *m, u_int32_t dev);
+void mix_setdevs(struct snd_mixer *m, uint32_t v);
+void mix_setrecdevs(struct snd_mixer *m, uint32_t v);
+uint32_t mix_getdevs(struct snd_mixer *m);
+uint32_t mix_getrecdevs(struct snd_mixer *m);
+void mix_setparentchild(struct snd_mixer *m, uint32_t parent, uint32_t childs);
+void mix_setrealdev(struct snd_mixer *m, uint32_t dev, uint32_t realdev);
+uint32_t mix_getparent(struct snd_mixer *m, uint32_t dev);
+uint32_t mix_getchild(struct snd_mixer *m, uint32_t dev);
void *mix_getdevinfo(struct snd_mixer *m);
struct mtx * mixer_get_lock(struct snd_mixer *m);
==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#16 (text+ko) ====
@@ -84,9 +84,9 @@
#define DPRINTF(...) do { } while (0)
#endif
-static u_int32_t uaudio_default_rate = 96000;
-static u_int8_t uaudio_default_bits = 32;
-static u_int8_t uaudio_default_channels = 2;
+static uint32_t uaudio_default_rate = 96000;
+static uint8_t uaudio_default_bits = 32;
+static uint8_t uaudio_default_channels = 2;
#define UAUDIO_NCHANBUFS 2 /* number of outstanding request */
#define UAUDIO_NFRAMES 25 /* ms of sound in each request */
@@ -103,16 +103,16 @@
int32_t maxval;
#define MIX_MAX_CHAN 8
int32_t wValue[MIX_MAX_CHAN]; /* using nchan */
- u_int32_t delta;
- u_int32_t mul;
- u_int32_t ctl;
+ uint32_t delta;
+ uint32_t mul;
+ uint32_t ctl;
- u_int16_t wData[MIX_MAX_CHAN]; /* using nchan */
- u_int16_t wIndex;
+ uint16_t wData[MIX_MAX_CHAN]; /* using nchan */
+ uint16_t wIndex;
- u_int8_t update[(MIX_MAX_CHAN+7)/8];
- u_int8_t nchan;
- u_int8_t type;
+ uint8_t update[(MIX_MAX_CHAN+7)/8];
+ uint8_t nchan;
+ uint8_t type;
#define MIX_ON_OFF 1
#define MIX_SIGNED_16 2
#define MIX_UNSIGNED_16 3
@@ -124,8 +124,8 @@
#define MIX_UNSIGNED(n) ((n) == MIX_UNSIGNED_16)
#define MAX_SELECTOR_INPUT_PIN 256
- u_int8_t slctrtype[MAX_SELECTOR_INPUT_PIN];
- u_int8_t class;
+ uint8_t slctrtype[MAX_SELECTOR_INPUT_PIN];
+ uint8_t class;
struct uaudio_mixer_node *next;
};
@@ -146,21 +146,21 @@
const usb_endpoint_descriptor_audio_t *p_ed2;
const struct uaudio_format *p_fmt;
- u_int8_t * buf; /* pointer to buffer */
- u_int8_t * start; /* upper layer buffer start */
- u_int8_t * end; /* upper layer buffer end */
- u_int8_t * cur; /* current position in upper layer buffer */
+ uint8_t * buf; /* pointer to buffer */
+ uint8_t * start; /* upper layer buffer start */
+ uint8_t * end; /* upper layer buffer end */
+ uint8_t * cur; /* current position in upper layer buffer */
- u_int32_t block_size;
- u_int32_t sample_rate;
- u_int32_t format;
- u_int32_t pcm_format[2];
+ uint32_t block_size;
+ uint32_t sample_rate;
+ uint32_t format;
+ uint32_t pcm_format[2];
- u_int16_t bytes_per_frame;
+ uint16_t bytes_per_frame;
- u_int8_t valid;
- u_int8_t iface_index;
- u_int8_t iface_alt_index;
+ uint8_t valid;
+ uint8_t iface_index;
+ uint8_t iface_alt_index;
};
#define UMIDI_N_TRANSFER 4 /* units */
@@ -169,10 +169,10 @@
struct umidi_sub_chan {
struct usb_cdev cdev;
- u_int8_t * temp_cmd;
- u_int8_t temp_0[4];
- u_int8_t temp_1[4];
- u_int8_t state;
+ uint8_t * temp_cmd;
+ uint8_t temp_0[4];
+ uint8_t temp_1[4];
+ uint8_t state;
#define UMIDI_ST_UNKNOWN 0 /* scan for command */
#define UMIDI_ST_1PARAM 1
#define UMIDI_ST_2PARAM_1 2
@@ -181,9 +181,9 @@
#define UMIDI_ST_SYSEX_1 5
#define UMIDI_ST_SYSEX_2 6
- u_int8_t read_open : 1;
- u_int8_t write_open : 1;
- u_int8_t unused : 6;
+ uint8_t read_open : 1;
+ uint8_t write_open : 1;
+ uint8_t unused : 6;
};
struct umidi_chan {
@@ -193,19 +193,19 @@
struct usbd_xfer *xfer[UMIDI_N_TRANSFER];
- u_int8_t iface_index;
- u_int8_t iface_alt_index;
+ uint8_t iface_index;
+ uint8_t iface_alt_index;
- u_int8_t flags;
+ uint8_t flags;
#define UMIDI_FLAG_READ_STALL 0x01
#define UMIDI_FLAG_WRITE_STALL 0x02
- u_int8_t read_open_refcount;
- u_int8_t write_open_refcount;
+ uint8_t read_open_refcount;
+ uint8_t write_open_refcount;
- u_int8_t curr_cable;
- u_int8_t max_cable;
- u_int8_t valid;
+ uint8_t curr_cable;
+ uint8_t max_cable;
+ uint8_t valid;
};
struct uaudio_softc {
@@ -221,29 +221,29 @@
struct uaudio_mixer_node * sc_mixer_root;
struct uaudio_mixer_node * sc_mixer_curr;
- u_int32_t sc_buffer_size;
- u_int32_t sc_mix_info;
- u_int32_t sc_recsrc_info;
- u_int32_t sc_quirks;
+ uint32_t sc_buffer_size;
+ uint32_t sc_mix_info;
+ uint32_t sc_recsrc_info;
+ uint32_t sc_quirks;
- u_int16_t sc_audio_rev;
- u_int16_t sc_mixer_count;
+ uint16_t sc_audio_rev;
+ uint16_t sc_mixer_count;
- u_int8_t sc_sndstat_valid;
- u_int8_t sc_mixer_iface_index;
- u_int8_t sc_mixer_iface_no;
- u_int8_t sc_mixer_chan;
- u_int8_t sc_pcm_registered : 1;
- u_int8_t sc_mixer_init : 1;
- u_int8_t sc_unused : 6;
+ uint8_t sc_sndstat_valid;
+ uint8_t sc_mixer_iface_index;
+ uint8_t sc_mixer_iface_no;
+ uint8_t sc_mixer_chan;
+ uint8_t sc_pcm_registered : 1;
+ uint8_t sc_mixer_init : 1;
+ uint8_t sc_unused : 6;
};
struct uaudio_search_result {
- u_int8_t bit_input[(256+7)/8];
- u_int8_t bit_output[(256+7)/8];
- u_int8_t bit_visited[(256+7)/8];
- u_int8_t recurse_level;
- u_int8_t id_max;
+ uint8_t bit_input[(256+7)/8];
+ uint8_t bit_output[(256+7)/8];
+ uint8_t bit_visited[(256+7)/8];
+ uint8_t recurse_level;
+ uint8_t id_max;
};
struct uaudio_terminal_node {
@@ -262,9 +262,9 @@
};
struct uaudio_format {
- u_int16_t wFormat;
- u_int8_t bPrecision;
- u_int32_t freebsd_fmt;
+ uint16_t wFormat;
+ uint8_t bPrecision;
+ uint32_t freebsd_fmt;
const char * description;
};
@@ -319,8 +319,8 @@
static void
uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usbd_device *udev,
- u_int32_t rate, u_int16_t fps, u_int8_t channels,
- u_int8_t bit_resolution);
+ uint32_t rate, uint16_t fps, uint8_t channels,
+ uint8_t bit_resolution);
static void
uaudio_chan_fill_info(struct uaudio_softc *sc, struct usbd_device *udev);
@@ -343,9 +343,9 @@
static void
uaudio_mixer_add_selector(struct uaudio_softc *sc,
const struct uaudio_terminal_node *iot, int id);
-static u_int32_t
+static uint32_t
uaudio_mixer_feature_get_bmaControls(const struct usb_audio_feature_unit *d,
- u_int8_t index);
+ uint8_t index);
static void
uaudio_mixer_add_feature(struct uaudio_softc *sc,
const struct uaudio_terminal_node *iot, int id);
@@ -360,65 +360,65 @@
uaudio_mixer_add_extension(struct uaudio_softc *sc,
const struct uaudio_terminal_node *iot, int id);
static const void *
-uaudio_mixer_verify_desc(const void *arg, u_int32_t len);
+uaudio_mixer_verify_desc(const void *arg, uint32_t len);
#ifdef USB_DEBUG
static void
-uaudio_mixer_dump_cluster(u_int8_t id, const struct uaudio_terminal_node *iot);
+uaudio_mixer_dump_cluster(uint8_t id, const struct uaudio_terminal_node *iot);
#endif
static struct usb_audio_cluster
-uaudio_mixer_get_cluster(u_int8_t id, const struct uaudio_terminal_node *iot);
+uaudio_mixer_get_cluster(uint8_t id, const struct uaudio_terminal_node *iot);
#ifdef USB_DEBUG
static const char *
-uaudio_mixer_get_terminal_name(u_int16_t terminal_type);
+uaudio_mixer_get_terminal_name(uint16_t terminal_type);
#endif
-static u_int16_t
+static uint16_t
uaudio_mixer_determine_class(const struct uaudio_terminal_node *iot,
struct uaudio_mixer_node *mix);
-static u_int16_t
+static uint16_t
uaudio_mixer_feature_name(const struct uaudio_terminal_node *iot,
struct uaudio_mixer_node *mix);
static const struct uaudio_terminal_node *
-uaudio_mixer_get_input(const struct uaudio_terminal_node *iot, u_int8_t index);
+uaudio_mixer_get_input(const struct uaudio_terminal_node *iot, uint8_t index);
static const struct uaudio_terminal_node *
uaudio_mixer_get_output(const struct uaudio_terminal_node *iot,
- u_int8_t index);
+ uint8_t index);
static void
uaudio_mixer_find_inputs_sub(struct uaudio_terminal_node *root,
- const u_int8_t *p_id, u_int8_t n_id,
+ const uint8_t *p_id, uint8_t n_id,
struct uaudio_search_result *info);
static void
-uaudio_mixer_find_outputs_sub(struct uaudio_terminal_node *root, u_int8_t id,
- u_int8_t n_id,
+uaudio_mixer_find_outputs_sub(struct uaudio_terminal_node *root, uint8_t id,
+ uint8_t n_id,
struct uaudio_search_result *info);
static void
uaudio_mixer_fill_info(struct uaudio_softc *sc, struct usbd_device *udev,
void *desc);
-static u_int16_t
-uaudio_mixer_get(struct usbd_device *udev, u_int8_t what,
+static uint16_t
+uaudio_mixer_get(struct usbd_device *udev, uint8_t what,
struct uaudio_mixer_node *mc);
static usbd_status
-uaudio_set_speed(struct usbd_device *udev, u_int8_t endpt, u_int32_t speed);
+uaudio_set_speed(struct usbd_device *udev, uint8_t endpt, uint32_t speed);
static int
-uaudio_mixer_signext(u_int8_t type, int val);
+uaudio_mixer_signext(uint8_t type, int val);
static int
uaudio_mixer_bsd2value(struct uaudio_mixer_node *mc, int32_t val);
static void
uaudio_mixer_ctl_set(struct uaudio_softc *sc, struct uaudio_mixer_node *mc,
- u_int8_t chan, int32_t val);
+ uint8_t chan, int32_t val);
static void
uaudio_mixer_init(struct uaudio_softc *sc);
-static u_int8_t
-umidi_convert_to_usb(struct umidi_sub_chan *sub, u_int8_t cn, u_int8_t b);
+static uint8_t
+umidi_convert_to_usb(struct umidi_sub_chan *sub, uint8_t cn, uint8_t b);
static struct umidi_sub_chan *
umidi_sub_by_cdev(struct usb_cdev *cdev);
@@ -556,7 +556,7 @@
};
static const
-u_int8_t umidi_cmd_to_len[16] = {
+uint8_t umidi_cmd_to_len[16] = {
[0x0] = 0, /* reserved */
[0x1] = 0, /* reserved */
[0x2] = 2, /* bytes */
@@ -892,8 +892,8 @@
static void
uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usbd_device *udev,
- u_int32_t rate, u_int16_t fps, u_int8_t channels,
- u_int8_t bit_resolution)
+ uint32_t rate, uint16_t fps, uint8_t channels,
+ uint8_t bit_resolution)
{
usb_descriptor_t *desc = NULL;
const struct usb_audio_streaming_interface_descriptor *asid = NULL;
@@ -905,18 +905,18 @@
usb_interface_descriptor_t *id;
const struct uaudio_format *p_fmt;
struct uaudio_chan * chan;
- u_int16_t curidx = 0xFFFF;
- u_int16_t lastidx = 0xFFFF;
- u_int16_t alt_index = 0;
- u_int16_t wFormat;
- u_int8_t ep_dir;
- u_int8_t ep_type;
- u_int8_t ep_sync;
- u_int8_t bChannels;
- u_int8_t bBitResolution;
- u_int8_t x;
- u_int8_t audio_if = 0;
- u_int8_t sample_size;
+ uint16_t curidx = 0xFFFF;
+ uint16_t lastidx = 0xFFFF;
+ uint16_t alt_index = 0;
+ uint16_t wFormat;
+ uint8_t ep_dir;
+ uint8_t ep_type;
+ uint8_t ep_sync;
+ uint8_t bChannels;
+ uint8_t bBitResolution;
+ uint8_t x;
+ uint8_t audio_if = 0;
+ uint8_t sample_size;
while ((desc = usbd_desc_foreach(cd, desc))) {
@@ -1180,13 +1180,13 @@
static void
uaudio_chan_fill_info(struct uaudio_softc *sc, struct usbd_device *udev)
{
- u_int32_t rate = uaudio_default_rate;
- u_int32_t z;
- u_int16_t fps = (usbd_get_speed(udev) == USB_SPEED_HIGH) ? 8000 : 1000;
- u_int8_t bits = uaudio_default_bits;
- u_int8_t y;
- u_int8_t channels = uaudio_default_channels;
- u_int8_t x;
+ uint32_t rate = uaudio_default_rate;
+ uint32_t z;
+ uint16_t fps = (usbd_get_speed(udev) == USB_SPEED_HIGH) ? 8000 : 1000;
+ uint8_t bits = uaudio_default_bits;
+ uint8_t y;
+ uint8_t channels = uaudio_default_channels;
+ uint8_t x;
bits -= (bits % 8);
rate -= (rate % fps);
@@ -1222,8 +1222,8 @@
{
struct uaudio_chan *ch = xfer->priv_sc;
uint32_t * p_len = xfer->frlengths;
- u_int32_t n;
- u_int32_t total = (ch->bytes_per_frame * xfer->nframes);
+ uint32_t n;
+ uint32_t total = (ch->bytes_per_frame * xfer->nframes);
uint32_t offset;
USBD_CHECK_STATUS(xfer);
@@ -1290,9 +1290,9 @@
{
struct uaudio_chan *ch = xfer->priv_sc;
uint32_t * p_len = xfer->frlengths;
- u_int32_t n;
- u_int32_t m;
- u_int32_t total = (xfer->nframes * ch->bytes_per_frame);
+ uint32_t n;
+ uint32_t m;
+ uint32_t total = (xfer->nframes * ch->bytes_per_frame);
uint32_t offset0;
uint32_t offset1;
@@ -1369,9 +1369,9 @@
{
struct uaudio_chan *ch = ((dir == PCMDIR_PLAY) ?
&(sc->sc_play_chan) : &(sc->sc_rec_chan));
- u_int8_t endpoint;
- u_int8_t iface_index;
- u_int8_t alt_index;
+ uint8_t endpoint;
+ uint8_t iface_index;
+ uint8_t alt_index;
usbd_status err;
ch->buf = malloc(sc->sc_buffer_size, M_DEVBUF, M_WAITOK | M_ZERO);
@@ -1475,7 +1475,7 @@
}
int
-uaudio_chan_set_param_blocksize(struct uaudio_chan *ch, u_int32_t blocksize)
+uaudio_chan_set_param_blocksize(struct uaudio_chan *ch, uint32_t blocksize)
{
uint32_t max = sndbuf_getmaxsize(ch->pcm_buf);
@@ -1519,7 +1519,7 @@
}
int
-uaudio_chan_set_param_speed(struct uaudio_chan *ch, u_int32_t speed)
+uaudio_chan_set_param_speed(struct uaudio_chan *ch, uint32_t speed)
{
if (speed != ch->sample_rate) {
DPRINTF(0, "rate conversion required\n");
@@ -1540,7 +1540,7 @@
}
int
-uaudio_chan_set_param_format(struct uaudio_chan *ch, u_int32_t format)
+uaudio_chan_set_param_format(struct uaudio_chan *ch, uint32_t format)
{
ch->format = format;
return 0;
@@ -1645,7 +1645,7 @@
#ifdef USB_DEBUG
if (uaudio_debug > 2) {
- u_int8_t i;
+ uint8_t i;
for (i = 0; i < mc->nchan; i++) {
DPRINTF(0, "[mix] wValue=%04x\n", mc->wValue[0]);
}
@@ -1699,16 +1699,16 @@
const struct usb_audio_mixer_unit_0 *d0 = iot[id].u.mu;
const struct usb_audio_mixer_unit_1 *d1;
- u_int32_t bno; /* bit number */
- u_int32_t p; /* bit number accumulator */
- u_int32_t mo; /* matching outputs */
- u_int32_t mc; /* matching channels */
- u_int32_t ichs; /* input channels */
- u_int32_t ochs; /* output channels */
- u_int32_t c;
- u_int32_t chs; /* channels */
- u_int32_t i;
- u_int32_t o;
+ uint32_t bno; /* bit number */
+ uint32_t p; /* bit number accumulator */
+ uint32_t mo; /* matching outputs */
+ uint32_t mc; /* matching channels */
+ uint32_t ichs; /* input channels */
+ uint32_t ochs; /* output channels */
+ uint32_t c;
+ uint32_t chs; /* channels */
+ uint32_t i;
+ uint32_t o;
DPRINTF(2, "bUnitId=%d bNrInPins=%d\n",
d0->bUnitId, d0->bNrInPins);
@@ -1784,7 +1784,7 @@
const struct usb_audio_selector_unit *d = iot[id].u.su;
struct uaudio_mixer_node mix;
struct uaudio_mixer_node dummy;
- u_int16_t i;
+ uint16_t i;
DPRINTF(2, "bUnitId=%d bNrInPins=%d\n",
d->bUnitId, d->bNrInPins);
@@ -1823,12 +1823,12 @@
return;
}
-static u_int32_t
+static uint32_t
uaudio_mixer_feature_get_bmaControls(const struct usb_audio_feature_unit *d,
- u_int8_t index)
+ uint8_t index)
{
- u_int32_t temp = 0;
- u_int32_t offset = (index * d->bControlSize);
+ uint32_t temp = 0;
+ uint32_t offset = (index * d->bControlSize);
if (d->bControlSize > 0) {
temp |= d->bmaControls[offset];
@@ -1851,14 +1851,14 @@
{
const struct usb_audio_feature_unit *d = iot[id].u.fu;
struct uaudio_mixer_node mix;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list