PERFORCE change 127072 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Mon Oct 1 12:24:36 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127072
Change 127072 by hselasky at hselasky_laptop001 on 2007/10/01 19:23:59
Style change;
- Put a single tab character between the #define and the macro name.
(See "man style")
The changes result from the following script kernel and
the three Norwegian characters; "æøå"
[ -f src/$F ] && (cat src/$F | sed -E -e "s/#[ ]*define[ ]*/&æøå/g" | \
sed -e "s/[ ]*æøå/ /g" > temp) && ((diff -u src/$F temp > /dev/null) || \
(cp temp src/$F))
Affected files ...
.. //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#4 edit
.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#18 edit
.. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#8 edit
.. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.h#7 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#18 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudioreg.h#4 edit
.. //depot/projects/usb/src/sys/dev/usb/dsbr100io.h#6 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.c#44 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.h#16 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#15 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#12 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#11 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kuefw.h#5 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rumreg.h#3 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rumvar.h#3 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#14 edit
.. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#18 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#4 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.h#12 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/rio500_usb.h#6 edit
.. //depot/projects/usb/src/sys/dev/usb/uark.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/ubser.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/ucom.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#13 edit
.. //depot/projects/usb/src/sys/dev/usb/ucycom.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.h#7 edit
.. //depot/projects/usb/src/sys/dev/usb/ufm.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdi.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdireg.h#5 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/ugensa.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.c#36 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.h#13 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/uhid.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/uhub.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/uipaq.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/umass.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/umct.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/umoscom.c#6 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/uplcom.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/urio.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.h#16 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#4 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#7 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_port.h#17 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_rdesc.h#3 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#46 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#14 edit
.. //depot/projects/usb/src/sys/dev/usb/uvisor.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#25 edit
.. //depot/projects/usb/src/sys/modules/ukbd/Makefile#3 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#9 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#11 edit
.. //depot/projects/usb/src/sys/sys/videodev.h#4 edit
.. //depot/projects/usb/src/sys/sys/videokern.h#3 edit
Differences ...
==== //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#4 (text) ====
@@ -42,7 +42,7 @@
#include <arm/at91/at91_pmcvar.h>
-#define MEM_RID 0
+#define MEM_RID 0
static device_probe_t ohci_atmelarm_probe;
static device_attach_t ohci_atmelarm_attach;
==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#18 (text) ====
@@ -48,22 +48,22 @@
#include <dev/ata/ata-all.h>
#include <ata_if.h>
-#define ATAUSB_BULK_SIZE (1<<17) /* don't set this lower than (1 << 16) */
+#define ATAUSB_BULK_SIZE (1<<17) /* don't set this lower than (1 << 16) */
/* Command Block Wrapper */
struct bbb_cbw {
uint8_t signature[4];
-#define CBWSIGNATURE 0x43425355
+#define CBWSIGNATURE 0x43425355
uint8_t tag[4];
uint8_t transfer_length[4];
uint8_t flags;
-#define CBWFLAGS_OUT 0x00
-#define CBWFLAGS_IN 0x80
+#define CBWFLAGS_OUT 0x00
+#define CBWFLAGS_IN 0x80
uint8_t lun;
uint8_t length;
-#define CBWCDBLENGTH 16
+#define CBWCDBLENGTH 16
uint8_t cdb[CBWCDBLENGTH];
} UPACKED;
@@ -71,14 +71,14 @@
/* Command Status Wrapper */
struct bbb_csw {
uint8_t signature[4];
-#define CSWSIGNATURE 0x53425355
+#define CSWSIGNATURE 0x53425355
uint8_t tag[4];
uint8_t residue[4];
uint8_t status;
-#define CSWSTATUS_GOOD 0x0
-#define CSWSTATUS_FAILED 0x1
-#define CSWSTATUS_PHASE 0x2
+#define CSWSTATUS_GOOD 0x0
+#define CSWSTATUS_FAILED 0x1
+#define CSWSTATUS_PHASE 0x2
} UPACKED;
/* USB-ATA 'controller' softc */
@@ -91,18 +91,18 @@
struct ata_channel *restart_ch;
struct ata_request *ata_request;
-#define ATAUSB_T_BBB_RESET1 0
-#define ATAUSB_T_BBB_RESET2 1
-#define ATAUSB_T_BBB_RESET3 2
-#define ATAUSB_T_BBB_COMMAND 3
-#define ATAUSB_T_BBB_DATA_READ 4
-#define ATAUSB_T_BBB_DATA_RD_CS 5
-#define ATAUSB_T_BBB_DATA_WRITE 6
-#define ATAUSB_T_BBB_DATA_WR_CS 7
-#define ATAUSB_T_BBB_STATUS 8
-#define ATAUSB_T_BBB_MAX 9
+#define ATAUSB_T_BBB_RESET1 0
+#define ATAUSB_T_BBB_RESET2 1
+#define ATAUSB_T_BBB_RESET3 2
+#define ATAUSB_T_BBB_COMMAND 3
+#define ATAUSB_T_BBB_DATA_READ 4
+#define ATAUSB_T_BBB_DATA_RD_CS 5
+#define ATAUSB_T_BBB_DATA_WRITE 6
+#define ATAUSB_T_BBB_DATA_WR_CS 7
+#define ATAUSB_T_BBB_STATUS 8
+#define ATAUSB_T_BBB_MAX 9
-#define ATAUSB_T_MAX ATAUSB_T_BBB_MAX
+#define ATAUSB_T_MAX ATAUSB_T_BBB_MAX
struct usbd_xfer * xfer[ATAUSB_T_MAX];
caddr_t ata_data;
==== //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#8 (text+ko) ====
@@ -32,7 +32,7 @@
MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
-#define MIXER_NAMELEN 16
+#define MIXER_NAMELEN 16
struct snd_mixer {
KOBJ_FIELDS;
void *devinfo;
@@ -126,12 +126,12 @@
}
#endif
-#define MIXER_SET_UNLOCK(x, y) do { \
+#define MIXER_SET_UNLOCK(x, y) do { \
if ((y) != 0) \
snd_mtxunlock((x)->lock); \
} while (0)
-#define MIXER_SET_LOCK(x, y) do { \
+#define MIXER_SET_LOCK(x, y) do { \
if ((y) != 0) \
snd_mtxlock((x)->lock); \
} while (0)
==== //depot/projects/usb/src/sys/dev/sound/pcm/mixer.h#7 (text+ko) ====
@@ -60,17 +60,17 @@
extern int mixer_count;
-#define MIXER_CMD_DIRECT 0 /* send command within driver */
-#define MIXER_CMD_CDEV 1 /* send command from cdev/ioctl */
+#define MIXER_CMD_DIRECT 0 /* send command within driver */
+#define MIXER_CMD_CDEV 1 /* send command from cdev/ioctl */
-#define MIXER_TYPE_PRIMARY 0 /* mixer_init() */
-#define MIXER_TYPE_SECONDARY 1 /* mixer_create() */
+#define MIXER_TYPE_PRIMARY 0 /* mixer_init() */
+#define MIXER_TYPE_SECONDARY 1 /* mixer_create() */
/*
* this is a kludge to allow hiding of the struct snd_mixer definition
* 512 should be enough for all architectures
*/
-#define MIXER_SIZE (512 + sizeof(struct kobj) + \
+#define MIXER_SIZE (512 + sizeof(struct kobj) + \
sizeof(oss_mixer_enuminfo))
-#define MIXER_DECLARE(name) static DEFINE_CLASS(name, name ## _methods, MIXER_SIZE)
+#define MIXER_DECLARE(name) static DEFINE_CLASS(name, name ## _methods, MIXER_SIZE)
==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#18 (text+ko) ====
@@ -72,7 +72,7 @@
#include <dev/sound/usb/uaudio.h>
#ifdef USB_DEBUG
-#define DPRINTF(n,fmt,...) \
+#define DPRINTF(n,fmt,...) \
do { if (uaudio_debug > (n)) { \
printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0)
@@ -81,27 +81,27 @@
SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RW,
&uaudio_debug, 0, "uaudio debug level");
#else
-#define DPRINTF(...) do { } while (0)
+#define DPRINTF(...) do { } while (0)
#endif
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 */
-#define UAUDIO_RECURSE_LIMIT 24 /* rounds */
-#define UAUDIO_DEFAULT_BUFSZ (16*1024) /* bytes */
+#define UAUDIO_NCHANBUFS 2 /* number of outstanding request */
+#define UAUDIO_NFRAMES 25 /* ms of sound in each request */
+#define UAUDIO_RECURSE_LIMIT 24 /* rounds */
+#define UAUDIO_DEFAULT_BUFSZ (16*1024) /* bytes */
-#define MAKE_WORD(h,l) (((h) << 8) | (l))
-#define BIT_TEST(bm,bno) (((bm)[(bno) / 8] >> (7 - ((bno) % 8))) & 1)
+#define MAKE_WORD(h,l) (((h) << 8) | (l))
+#define BIT_TEST(bm,bno) (((bm)[(bno) / 8] >> (7 - ((bno) % 8))) & 1)
struct uaudio_mixer_node {
int32_t minval;
int32_t maxval;
-#define MIX_MAX_CHAN 8
+#define MIX_MAX_CHAN 8
int32_t wValue[MIX_MAX_CHAN]; /* using nchan */
uint32_t delta;
uint32_t mul;
@@ -113,17 +113,17 @@
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
-#define MIX_SIGNED_8 4
-#define MIX_SELECTOR 5
-#define MIX_UNKNOWN 6
-#define MIX_SIZE(n) ((((n) == MIX_SIGNED_16) || \
+#define MIX_ON_OFF 1
+#define MIX_SIGNED_16 2
+#define MIX_UNSIGNED_16 3
+#define MIX_SIGNED_8 4
+#define MIX_SELECTOR 5
+#define MIX_UNKNOWN 6
+#define MIX_SIZE(n) ((((n) == MIX_SIGNED_16) || \
((n) == MIX_UNSIGNED_16)) ? 2 : 1)
-#define MIX_UNSIGNED(n) ((n) == MIX_UNSIGNED_16)
+#define MIX_UNSIGNED(n) ((n) == MIX_UNSIGNED_16)
-#define MAX_SELECTOR_INPUT_PIN 256
+#define MAX_SELECTOR_INPUT_PIN 256
uint8_t slctrtype[MAX_SELECTOR_INPUT_PIN];
uint8_t class;
@@ -163,9 +163,9 @@
uint8_t iface_alt_index;
};
-#define UMIDI_N_TRANSFER 4 /* units */
-#define UMIDI_CABLES_MAX 16 /* units */
-#define UMIDI_BULK_SIZE 1024 /* bytes */
+#define UMIDI_N_TRANSFER 4 /* units */
+#define UMIDI_CABLES_MAX 16 /* units */
+#define UMIDI_BULK_SIZE 1024 /* bytes */
struct umidi_sub_chan {
struct usb_cdev cdev;
@@ -173,13 +173,13 @@
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
-#define UMIDI_ST_2PARAM_2 3
-#define UMIDI_ST_SYSEX_0 4
-#define UMIDI_ST_SYSEX_1 5
-#define UMIDI_ST_SYSEX_2 6
+#define UMIDI_ST_UNKNOWN 0 /* scan for command */
+#define UMIDI_ST_1PARAM 1
+#define UMIDI_ST_2PARAM_1 2
+#define UMIDI_ST_2PARAM_2 3
+#define UMIDI_ST_SYSEX_0 4
+#define UMIDI_ST_SYSEX_1 5
+#define UMIDI_ST_SYSEX_2 6
uint8_t read_open : 1;
uint8_t write_open : 1;
@@ -197,8 +197,8 @@
uint8_t iface_alt_index;
uint8_t flags;
-#define UMIDI_FLAG_READ_STALL 0x01
-#define UMIDI_FLAG_WRITE_STALL 0x02
+#define UMIDI_FLAG_READ_STALL 0x01
+#define UMIDI_FLAG_WRITE_STALL 0x02
uint8_t read_open_refcount;
uint8_t write_open_refcount;
@@ -286,11 +286,11 @@
{0,0,0,NULL}
};
-#define UAC_OUTPUT 0
-#define UAC_INPUT 1
-#define UAC_EQUAL 2
-#define UAC_RECORD 3
-#define UAC_NCLASSES 4
+#define UAC_OUTPUT 0
+#define UAC_INPUT 1
+#define UAC_EQUAL 2
+#define UAC_RECORD 3
+#define UAC_NCLASSES 4
#ifdef USB_DEBUG
static const char *uac_names[] = {
==== //depot/projects/usb/src/sys/dev/sound/usb/uaudioreg.h#4 (text+ko) ====
@@ -38,21 +38,21 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#define UAUDIO_VERSION 0x100
+#define UAUDIO_VERSION 0x100
-#define UDESC_CS_CONFIG 0x22
-#define UDESC_CS_STRING 0x23
-#define UDESC_CS_INTERFACE 0x24
-#define UDESC_CS_ENDPOINT 0x25
+#define UDESC_CS_CONFIG 0x22
+#define UDESC_CS_STRING 0x23
+#define UDESC_CS_INTERFACE 0x24
+#define UDESC_CS_ENDPOINT 0x25
-#define UDESCSUB_AC_HEADER 1
-#define UDESCSUB_AC_INPUT 2
-#define UDESCSUB_AC_OUTPUT 3
-#define UDESCSUB_AC_MIXER 4
-#define UDESCSUB_AC_SELECTOR 5
-#define UDESCSUB_AC_FEATURE 6
-#define UDESCSUB_AC_PROCESSING 7
-#define UDESCSUB_AC_EXTENSION 8
+#define UDESCSUB_AC_HEADER 1
+#define UDESCSUB_AC_INPUT 2
+#define UDESCSUB_AC_OUTPUT 3
+#define UDESCSUB_AC_MIXER 4
+#define UDESCSUB_AC_SELECTOR 5
+#define UDESCSUB_AC_FEATURE 6
+#define UDESCSUB_AC_PROCESSING 7
+#define UDESCSUB_AC_EXTENSION 8
/* The first fields are identical to usb_endpoint_descriptor_t */
typedef struct {
@@ -97,9 +97,9 @@
uByte bDescriptorType;
uByte bDescriptorSubtype;
uByte bmAttributes;
-#define UA_SED_FREQ_CONTROL 0x01
-#define UA_SED_PITCH_CONTROL 0x02
-#define UA_SED_MAXPACKETSONLY 0x80
+#define UA_SED_FREQ_CONTROL 0x01
+#define UA_SED_PITCH_CONTROL 0x02
+#define UA_SED_MAXPACKETSONLY 0x80
uByte bLockDelayUnits;
uWord wLockDelay;
} UPACKED;
@@ -113,13 +113,13 @@
uByte bSubFrameSize;
uByte bBitResolution;
uByte bSamFreqType;
-#define UA_SAMP_CONTNUOUS 0
+#define UA_SAMP_CONTNUOUS 0
uByte tSamFreq[0];
-#define UA_GETSAMP(p, n) (((p)->tSamFreq[((n)*3)+0]) | \
+#define UA_GETSAMP(p, n) (((p)->tSamFreq[((n)*3)+0]) | \
((p)->tSamFreq[((n)*3)+1] << 8) | \
((p)->tSamFreq[((n)*3)+2] << 16))
-#define UA_SAMP_LO(p) UA_GETSAMP(p, 0)
-#define UA_SAMP_HI(p) UA_GETSAMP(p, 1)
+#define UA_SAMP_LO(p) UA_GETSAMP(p, 0)
+#define UA_SAMP_HI(p) UA_GETSAMP(p, 1)
} UPACKED;
struct usb_audio_cluster {
@@ -232,7 +232,7 @@
uByte iChannelNames;
uByte bControlSize;
uByte bmControls[0]; /* [bControlSize] */
-#define UA_PROC_ENABLE_MASK 1
+#define UA_PROC_ENABLE_MASK 1
} UPACKED;
struct usb_audio_processing_unit_updown {
@@ -258,149 +258,149 @@
uByte iChannelNames;
uByte bControlSize;
uByte bmControls[0]; /* [bControlSize] */
-#define UA_EXT_ENABLE_MASK 1
-#define UA_EXT_ENABLE 1
+#define UA_EXT_ENABLE_MASK 1
+#define UA_EXT_ENABLE 1
/*uByte iExtension;*/
} UPACKED;
/* USB terminal types */
-#define UAT_UNDEFINED 0x0100
-#define UAT_STREAM 0x0101
-#define UAT_VENDOR 0x01ff
+#define UAT_UNDEFINED 0x0100
+#define UAT_STREAM 0x0101
+#define UAT_VENDOR 0x01ff
/* input terminal types */
-#define UATI_UNDEFINED 0x0200
-#define UATI_MICROPHONE 0x0201
-#define UATI_DESKMICROPHONE 0x0202
-#define UATI_PERSONALMICROPHONE 0x0203
-#define UATI_OMNIMICROPHONE 0x0204
-#define UATI_MICROPHONEARRAY 0x0205
-#define UATI_PROCMICROPHONEARR 0x0206
+#define UATI_UNDEFINED 0x0200
+#define UATI_MICROPHONE 0x0201
+#define UATI_DESKMICROPHONE 0x0202
+#define UATI_PERSONALMICROPHONE 0x0203
+#define UATI_OMNIMICROPHONE 0x0204
+#define UATI_MICROPHONEARRAY 0x0205
+#define UATI_PROCMICROPHONEARR 0x0206
/* output terminal types */
-#define UATO_UNDEFINED 0x0300
-#define UATO_SPEAKER 0x0301
-#define UATO_HEADPHONES 0x0302
-#define UATO_DISPLAYAUDIO 0x0303
-#define UATO_DESKTOPSPEAKER 0x0304
-#define UATO_ROOMSPEAKER 0x0305
-#define UATO_COMMSPEAKER 0x0306
-#define UATO_SUBWOOFER 0x0307
+#define UATO_UNDEFINED 0x0300
+#define UATO_SPEAKER 0x0301
+#define UATO_HEADPHONES 0x0302
+#define UATO_DISPLAYAUDIO 0x0303
+#define UATO_DESKTOPSPEAKER 0x0304
+#define UATO_ROOMSPEAKER 0x0305
+#define UATO_COMMSPEAKER 0x0306
+#define UATO_SUBWOOFER 0x0307
/* bidir terminal types */
-#define UATB_UNDEFINED 0x0400
-#define UATB_HANDSET 0x0401
-#define UATB_HEADSET 0x0402
-#define UATB_SPEAKERPHONE 0x0403
-#define UATB_SPEAKERPHONEESUP 0x0404
-#define UATB_SPEAKERPHONEECANC 0x0405
+#define UATB_UNDEFINED 0x0400
+#define UATB_HANDSET 0x0401
+#define UATB_HEADSET 0x0402
+#define UATB_SPEAKERPHONE 0x0403
+#define UATB_SPEAKERPHONEESUP 0x0404
+#define UATB_SPEAKERPHONEECANC 0x0405
/* telephony terminal types */
-#define UATT_UNDEFINED 0x0500
-#define UATT_PHONELINE 0x0501
-#define UATT_TELEPHONE 0x0502
-#define UATT_DOWNLINEPHONE 0x0503
+#define UATT_UNDEFINED 0x0500
+#define UATT_PHONELINE 0x0501
+#define UATT_TELEPHONE 0x0502
+#define UATT_DOWNLINEPHONE 0x0503
/* external terminal types */
-#define UATE_UNDEFINED 0x0600
-#define UATE_ANALOGCONN 0x0601
-#define UATE_DIGITALAUIFC 0x0602
-#define UATE_LINECONN 0x0603
-#define UATE_LEGACYCONN 0x0604
-#define UATE_SPDIF 0x0605
-#define UATE_1394DA 0x0606
-#define UATE_1394DV 0x0607
+#define UATE_UNDEFINED 0x0600
+#define UATE_ANALOGCONN 0x0601
+#define UATE_DIGITALAUIFC 0x0602
+#define UATE_LINECONN 0x0603
+#define UATE_LEGACYCONN 0x0604
+#define UATE_SPDIF 0x0605
+#define UATE_1394DA 0x0606
+#define UATE_1394DV 0x0607
/* embedded function terminal types */
-#define UATF_UNDEFINED 0x0700
-#define UATF_CALIBNOISE 0x0701
-#define UATF_EQUNOISE 0x0702
-#define UATF_CDPLAYER 0x0703
-#define UATF_DAT 0x0704
-#define UATF_DCC 0x0705
-#define UATF_MINIDISK 0x0706
-#define UATF_ANALOGTAPE 0x0707
-#define UATF_PHONOGRAPH 0x0708
-#define UATF_VCRAUDIO 0x0709
-#define UATF_VIDEODISCAUDIO 0x070a
-#define UATF_DVDAUDIO 0x070b
-#define UATF_TVTUNERAUDIO 0x070c
-#define UATF_SATELLITE 0x070d
-#define UATF_CABLETUNER 0x070e
-#define UATF_DSS 0x070f
-#define UATF_RADIORECV 0x0710
-#define UATF_RADIOXMIT 0x0711
-#define UATF_MULTITRACK 0x0712
-#define UATF_SYNTHESIZER 0x0713
+#define UATF_UNDEFINED 0x0700
+#define UATF_CALIBNOISE 0x0701
+#define UATF_EQUNOISE 0x0702
+#define UATF_CDPLAYER 0x0703
+#define UATF_DAT 0x0704
+#define UATF_DCC 0x0705
+#define UATF_MINIDISK 0x0706
+#define UATF_ANALOGTAPE 0x0707
+#define UATF_PHONOGRAPH 0x0708
+#define UATF_VCRAUDIO 0x0709
+#define UATF_VIDEODISCAUDIO 0x070a
+#define UATF_DVDAUDIO 0x070b
+#define UATF_TVTUNERAUDIO 0x070c
+#define UATF_SATELLITE 0x070d
+#define UATF_CABLETUNER 0x070e
+#define UATF_DSS 0x070f
+#define UATF_RADIORECV 0x0710
+#define UATF_RADIOXMIT 0x0711
+#define UATF_MULTITRACK 0x0712
+#define UATF_SYNTHESIZER 0x0713
-#define SET_CUR 0x01
-#define GET_CUR 0x81
-#define SET_MIN 0x02
-#define GET_MIN 0x82
-#define SET_MAX 0x03
-#define GET_MAX 0x83
-#define SET_RES 0x04
-#define GET_RES 0x84
-#define SET_MEM 0x05
-#define GET_MEM 0x85
-#define GET_STAT 0xff
+#define SET_CUR 0x01
+#define GET_CUR 0x81
+#define SET_MIN 0x02
+#define GET_MIN 0x82
+#define SET_MAX 0x03
+#define GET_MAX 0x83
+#define SET_RES 0x04
+#define GET_RES 0x84
+#define SET_MEM 0x05
+#define GET_MEM 0x85
+#define GET_STAT 0xff
-#define MUTE_CONTROL 0x01
-#define VOLUME_CONTROL 0x02
-#define BASS_CONTROL 0x03
-#define MID_CONTROL 0x04
-#define TREBLE_CONTROL 0x05
-#define GRAPHIC_EQUALIZER_CONTROL 0x06
-#define AGC_CONTROL 0x07
-#define DELAY_CONTROL 0x08
-#define BASS_BOOST_CONTROL 0x09
-#define LOUDNESS_CONTROL 0x0a
+#define MUTE_CONTROL 0x01
+#define VOLUME_CONTROL 0x02
+#define BASS_CONTROL 0x03
+#define MID_CONTROL 0x04
+#define TREBLE_CONTROL 0x05
+#define GRAPHIC_EQUALIZER_CONTROL 0x06
+#define AGC_CONTROL 0x07
+#define DELAY_CONTROL 0x08
+#define BASS_BOOST_CONTROL 0x09
+#define LOUDNESS_CONTROL 0x0a
-#define FU_MASK(u) (1 << ((u)-1))
+#define FU_MASK(u) (1 << ((u)-1))
-#define MASTER_CHAN 0
+#define MASTER_CHAN 0
-#define AS_GENERAL 1
-#define FORMAT_TYPE 2
-#define FORMAT_SPECIFIC 3
+#define AS_GENERAL 1
+#define FORMAT_TYPE 2
+#define FORMAT_SPECIFIC 3
-#define UA_FMT_PCM 1
-#define UA_FMT_PCM8 2
-#define UA_FMT_IEEE_FLOAT 3
-#define UA_FMT_ALAW 4
-#define UA_FMT_MULAW 5
-#define UA_FMT_MPEG 0x1001
-#define UA_FMT_AC3 0x1002
+#define UA_FMT_PCM 1
+#define UA_FMT_PCM8 2
+#define UA_FMT_IEEE_FLOAT 3
+#define UA_FMT_ALAW 4
+#define UA_FMT_MULAW 5
+#define UA_FMT_MPEG 0x1001
+#define UA_FMT_AC3 0x1002
-#define SAMPLING_FREQ_CONTROL 0x01
-#define PITCH_CONTROL 0x02
+#define SAMPLING_FREQ_CONTROL 0x01
+#define PITCH_CONTROL 0x02
-#define FORMAT_TYPE_UNDEFINED 0
-#define FORMAT_TYPE_I 1
-#define FORMAT_TYPE_II 2
-#define FORMAT_TYPE_III 3
+#define FORMAT_TYPE_UNDEFINED 0
+#define FORMAT_TYPE_I 1
+#define FORMAT_TYPE_II 2
+#define FORMAT_TYPE_III 3
-#define UA_PROC_MASK(n) (1<< ((n)-1))
-#define PROCESS_UNDEFINED 0
-#define XX_ENABLE_CONTROL 1
-#define UPDOWNMIX_PROCESS 1
-#define UD_ENABLE_CONTROL 1
-#define UD_MODE_SELECT_CONTROL 2
-#define DOLBY_PROLOGIC_PROCESS 2
-#define DP_ENABLE_CONTROL 1
-#define DP_MODE_SELECT_CONTROL 2
-#define P3D_STEREO_EXTENDER_PROCESS 3
-#define P3D_ENABLE_CONTROL 1
-#define P3D_SPACIOUSNESS_CONTROL 2
-#define REVERBATION_PROCESS 4
-#define RV_ENABLE_CONTROL 1
-#define RV_LEVEL_CONTROL 2
-#define RV_TIME_CONTROL 3
-#define RV_FEEDBACK_CONTROL 4
-#define CHORUS_PROCESS 5
-#define CH_ENABLE_CONTROL 1
-#define CH_LEVEL_CONTROL 2
-#define CH_RATE_CONTROL 3
-#define CH_DEPTH_CONTROL 4
-#define DYN_RANGE_COMP_PROCESS 6
-#define DR_ENABLE_CONTROL 1
-#define DR_COMPRESSION_RATE_CONTROL 2
-#define DR_MAXAMPL_CONTROL 3
-#define DR_THRESHOLD_CONTROL 4
-#define DR_ATTACK_TIME_CONTROL 5
-#define DR_RELEASE_TIME_CONTROL 6
+#define UA_PROC_MASK(n) (1<< ((n)-1))
+#define PROCESS_UNDEFINED 0
+#define XX_ENABLE_CONTROL 1
+#define UPDOWNMIX_PROCESS 1
+#define UD_ENABLE_CONTROL 1
+#define UD_MODE_SELECT_CONTROL 2
+#define DOLBY_PROLOGIC_PROCESS 2
+#define DP_ENABLE_CONTROL 1
+#define DP_MODE_SELECT_CONTROL 2
+#define P3D_STEREO_EXTENDER_PROCESS 3
+#define P3D_ENABLE_CONTROL 1
+#define P3D_SPACIOUSNESS_CONTROL 2
+#define REVERBATION_PROCESS 4
+#define RV_ENABLE_CONTROL 1
+#define RV_LEVEL_CONTROL 2
+#define RV_TIME_CONTROL 3
+#define RV_FEEDBACK_CONTROL 4
+#define CHORUS_PROCESS 5
+#define CH_ENABLE_CONTROL 1
+#define CH_LEVEL_CONTROL 2
+#define CH_RATE_CONTROL 3
+#define CH_DEPTH_CONTROL 4
+#define DYN_RANGE_COMP_PROCESS 6
+#define DR_ENABLE_CONTROL 1
+#define DR_COMPRESSION_RATE_CONTROL 2
+#define DR_MAXAMPL_CONTROL 3
+#define DR_THRESHOLD_CONTROL 4
+#define DR_ATTACK_TIME_CONTROL 5
+#define DR_RELEASE_TIME_CONTROL 6
==== //depot/projects/usb/src/sys/dev/usb/dsbr100io.h#6 (text+ko) ====
@@ -32,8 +32,8 @@
#include <sys/ioccom.h>
-#define FM_SET_FREQ _IOWR('U', 200, int)
-#define FM_GET_FREQ _IOWR('U', 201, int)
-#define FM_START _IOWR('U', 202, int)
-#define FM_STOP _IOWR('U', 203, int)
-#define FM_GET_STAT _IOWR('U', 204, int)
+#define FM_SET_FREQ _IOWR('U', 200, int)
+#define FM_GET_FREQ _IOWR('U', 201, int)
+#define FM_START _IOWR('U', 202, int)
+#define FM_STOP _IOWR('U', 203, int)
+#define FM_GET_STAT _IOWR('U', 204, int)
==== //depot/projects/usb/src/sys/dev/usb/ehci.c#44 (text+ko) ====
@@ -62,22 +62,22 @@
#include <sys/lock.h>
#include <sys/malloc.h>
-#define INCLUDE_PCIXXX_H
-#define usbd_config_td_cc ehci_config_copy
-#define usbd_config_td_softc ehci_softc
+#define INCLUDE_PCIXXX_H
+#define usbd_config_td_cc ehci_config_copy
+#define usbd_config_td_softc ehci_softc
#include <dev/usb/usb_port.h>
#include <dev/usb/usb.h>
#include <dev/usb/usb_subr.h>
#include <dev/usb/ehci.h>
-#define EHCI_BUS2SC(bus) ((ehci_softc_t *)(((uint8_t *)(bus)) - \
+#define EHCI_BUS2SC(bus) ((ehci_softc_t *)(((uint8_t *)(bus)) - \
POINTER_TO_UNSIGNED(&(((ehci_softc_t *)0)->sc_bus))))
#ifdef USB_DEBUG
-#define DPRINTF(x) do { if (ehcidebug) { printf("%s: ", __FUNCTION__); \
+#define DPRINTF(x) do { if (ehcidebug) { printf("%s: ", __FUNCTION__); \
printf x ; } } while (0)
-#define DPRINTFN(n,x) do { if (ehcidebug > (n)) { printf("%s: ", __FUNCTION__); \
+#define DPRINTFN(n,x) do { if (ehcidebug > (n)) { printf("%s: ", __FUNCTION__); \
printf x ; } } while (0)
int ehcidebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci");
@@ -89,11 +89,11 @@
static void
ehci_dump_sqh(ehci_qh_t *sqh);
#else
-#define DPRINTF(x) do { } while (0)
-#define DPRINTFN(n,x) do { } while (0)
+#define DPRINTF(x) do { } while (0)
+#define DPRINTFN(n,x) do { } while (0)
#endif
-#define EHCI_INTR_ENDPT 1
+#define EHCI_INTR_ENDPT 1
extern struct usbd_bus_methods ehci_bus_methods;
extern struct usbd_pipe_methods ehci_device_bulk_methods;
@@ -111,7 +111,7 @@
static usbd_std_root_transfer_func_t ehci_root_intr_done;
static usbd_std_root_transfer_func_t ehci_root_ctrl_task_td_sub;
-#define SC_HW_PHYSADDR(sc,what) \
+#define SC_HW_PHYSADDR(sc,what) \
((sc)->sc_hw_page.physaddr + \
POINTER_TO_UNSIGNED(&(((struct ehci_hw_softc *)0)->what)))
@@ -883,7 +883,7 @@
}
#endif
-#define EHCI_APPEND_FS_TD(std,last) (last) = _ehci_append_fs_td(std,last)
+#define EHCI_APPEND_FS_TD(std,last) (last) = _ehci_append_fs_td(std,last)
static ehci_sitd_t *
_ehci_append_fs_td(ehci_sitd_t *std, ehci_sitd_t *last)
{
@@ -912,7 +912,7 @@
return (std);
}
-#define EHCI_APPEND_HS_TD(std,last) (last) = _ehci_append_hs_td(std,last)
+#define EHCI_APPEND_HS_TD(std,last) (last) = _ehci_append_hs_td(std,last)
static ehci_itd_t *
_ehci_append_hs_td(ehci_itd_t *std, ehci_itd_t *last)
{
@@ -941,7 +941,7 @@
return (std);
}
-#define EHCI_APPEND_QH(sqh,last) (last) = _ehci_append_qh(sqh,last)
+#define EHCI_APPEND_QH(sqh,last) (last) = _ehci_append_qh(sqh,last)
static ehci_qh_t *
_ehci_append_qh(ehci_qh_t *sqh, ehci_qh_t *last)
{
@@ -978,7 +978,7 @@
return (sqh);
}
-#define EHCI_REMOVE_FS_TD(std,last) (last) = _ehci_remove_fs_td(std,last)
+#define EHCI_REMOVE_FS_TD(std,last) (last) = _ehci_remove_fs_td(std,last)
static ehci_sitd_t *
_ehci_remove_fs_td(ehci_sitd_t *std, ehci_sitd_t *last)
{
@@ -1002,7 +1002,7 @@
return ((last == std) ? std->prev : last);
}
-#define EHCI_REMOVE_HS_TD(std,last) (last) = _ehci_remove_hs_td(std,last)
+#define EHCI_REMOVE_HS_TD(std,last) (last) = _ehci_remove_hs_td(std,last)
static ehci_itd_t *
_ehci_remove_hs_td(ehci_itd_t *std, ehci_itd_t *last)
{
@@ -1026,7 +1026,7 @@
return ((last == std) ? std->prev : last);
}
-#define EHCI_REMOVE_QH(sqh,last) (last) = _ehci_remove_qh(sqh,last)
+#define EHCI_REMOVE_QH(sqh,last) (last) = _ehci_remove_qh(sqh,last)
static ehci_qh_t *
_ehci_remove_qh(ehci_qh_t *sqh, ehci_qh_t *last)
{
@@ -1592,7 +1592,7 @@
return;
}
-#define ehci_add_interrupt_info(sc, xfer) \
+#define ehci_add_interrupt_info(sc, xfer) \
LIST_INSERT_HEAD(&(sc)->sc_interrupt_list_head, (xfer), interrupt_list)
static void
@@ -3347,7 +3347,7 @@
std->req.bmRequestType, std->req.bRequest,
UGETW(std->req.wLength), value, index));
-#define C(x,y) ((x) | ((y) << 8))
+#define C(x,y) ((x) | ((y) << 8))
switch (C(std->req.bRequest, std->req.bmRequestType)) {
case C(UR_CLEAR_FEATURE, UT_WRITE_DEVICE):
case C(UR_CLEAR_FEATURE, UT_WRITE_INTERFACE):
==== //depot/projects/usb/src/sys/dev/usb/ehci.h#16 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#ifndef _EHCI_H_
-#define _EHCI_H_
+#define _EHCI_H_
/* PCI config registers */
#define PCI_CBMEM 0x10 /* configuration base MEM */
@@ -112,7 +112,7 @@
#define EHCI_STS_INT 0x00000001 /* RWC interrupt */
#define EHCI_STS_INTRS(x) ((x) & 0x3f)
-#define EHCI_NORMAL_INTRS (/* EHCI_STS_IAA | */ EHCI_STS_HSE | \
+#define EHCI_NORMAL_INTRS (/* EHCI_STS_IAA | */ EHCI_STS_HSE | \
EHCI_STS_PCD | EHCI_STS_ERRINT | EHCI_STS_INT)
#define EHCI_USBINTR 0x08 /* RW Interrupt register */
@@ -222,7 +222,7 @@
#define EHCI_ITD_SET_ADDR(x) (x)
#define EHCI_ITD_GET_ADDR(x) (((x) >> 0) & 0x7F)
#define EHCI_ITD_SET_ENDPT(x) ((x) << 8)
-#define EHCI_ITD_GET_ENDPT(x) (((x) >> 8) & 0xF)
+#define EHCI_ITD_GET_ENDPT(x) (((x) >> 8) & 0xF)
/* itd_bp[1] */
#define EHCI_ITD_SET_DIR_IN (1 << 11)
#define EHCI_ITD_SET_DIR_OUT (0 << 11)
==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#22 (text+ko) ====
@@ -62,28 +62,28 @@
#include <sys/lock.h>
#include <sys/malloc.h>
-#define INCLUDE_PCIXXX_H
+#define INCLUDE_PCIXXX_H
#include <dev/usb/usb_port.h>
#include <dev/usb/usb.h>
#include <dev/usb/usb_subr.h>
#include <dev/usb/ehci.h>
-#define PCI_EHCI_VENDORID_ACERLABS 0x10b9
-#define PCI_EHCI_VENDORID_AMD 0x1022
-#define PCI_EHCI_VENDORID_APPLE 0x106b
-#define PCI_EHCI_VENDORID_ATI 0x1002
-#define PCI_EHCI_VENDORID_CMDTECH 0x1095
-#define PCI_EHCI_VENDORID_INTEL 0x8086
-#define PCI_EHCI_VENDORID_NEC 0x1033
-#define PCI_EHCI_VENDORID_OPTI 0x1045
-#define PCI_EHCI_VENDORID_PHILIPS 0x1131
-#define PCI_EHCI_VENDORID_SIS 0x1039
-#define PCI_EHCI_VENDORID_NVIDIA 0x12D2
-#define PCI_EHCI_VENDORID_NVIDIA2 0x10DE
-#define PCI_EHCI_VENDORID_VIA 0x1106
+#define PCI_EHCI_VENDORID_ACERLABS 0x10b9
+#define PCI_EHCI_VENDORID_AMD 0x1022
+#define PCI_EHCI_VENDORID_APPLE 0x106b
+#define PCI_EHCI_VENDORID_ATI 0x1002
+#define PCI_EHCI_VENDORID_CMDTECH 0x1095
+#define PCI_EHCI_VENDORID_INTEL 0x8086
+#define PCI_EHCI_VENDORID_NEC 0x1033
+#define PCI_EHCI_VENDORID_OPTI 0x1045
+#define PCI_EHCI_VENDORID_PHILIPS 0x1131
+#define PCI_EHCI_VENDORID_SIS 0x1039
+#define PCI_EHCI_VENDORID_NVIDIA 0x12D2
+#define PCI_EHCI_VENDORID_NVIDIA2 0x10DE
+#define PCI_EHCI_VENDORID_VIA 0x1106
-#define PCI_EHCI_BASE_REG 0x10
+#define PCI_EHCI_BASE_REG 0x10
static void ehci_pci_givecontroller(device_t self);
static void ehci_pci_takecontroller(device_t self);
==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#31 (text+ko) ====
@@ -85,8 +85,8 @@
#include <net/bpf.h>
-#define usbd_config_td_cc aue_config_copy
-#define usbd_config_td_softc aue_softc
+#define usbd_config_td_cc aue_config_copy
+#define usbd_config_td_softc aue_softc
#include <dev/usb/usb_port.h>
#include <dev/usb/usb.h>
@@ -107,7 +107,7 @@
MODULE_DEPEND(aue, miibus, 1, 1, 1);
#ifdef USB_DEBUG
-#define DPRINTF(sc,n,fmt,...) \
+#define DPRINTF(sc,n,fmt,...) \
do { if (aue_debug > (n)) { \
printf("%s:%s: " fmt, (sc)->sc_name, \
__FUNCTION__,## __VA_ARGS__); } } while (0)
@@ -117,7 +117,7 @@
SYSCTL_INT(_hw_usb_aue, OID_AUTO, debug, CTLFLAG_RW, &aue_debug, 0,
"aue debug level");
#else
-#define DPRINTF(...)
+#define DPRINTF(...)
#endif
/*
@@ -198,7 +198,7 @@
{{ USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100}, 0 },
{{ USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB110}, AUE_FLAG_PII },
};
-#define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p))
+#define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p))
/* prototypes */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list