diff options
author | nsouch <nsouch@FreeBSD.org> | 1999-01-31 11:52:04 +0000 |
---|---|---|
committer | nsouch <nsouch@FreeBSD.org> | 1999-01-31 11:52:04 +0000 |
commit | 3d95317df913ff24462469e830baaaf6533542bb (patch) | |
tree | 88a5d673975047c7325c89fadd1a9ff14715249f /sys/dev | |
parent | 711b6c44998368611c2a7f8759cdd3e40bf4f3a5 (diff) | |
download | FreeBSD-src-3d95317df913ff24462469e830baaaf6533542bb.zip FreeBSD-src-3d95317df913ff24462469e830baaaf6533542bb.tar.gz |
Fix compile warnings about missing braces around static initialization of unions.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/ppbus/ppb_msq.h | 44 | ||||
-rw-r--r-- | sys/dev/ppc/ppc.c | 6 |
2 files changed, 25 insertions, 25 deletions
diff --git a/sys/dev/ppbus/ppb_msq.h b/sys/dev/ppbus/ppb_msq.h index ff43a36..3ddf434 100644 --- a/sys/dev/ppbus/ppb_msq.h +++ b/sys/dev/ppbus/ppb_msq.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ppb_msq.h,v 1.4 1999/01/27 21:49:53 dillon Exp $ + * $Id: ppb_msq.h,v 1.5 1999/01/30 15:35:39 nsouch Exp $ * */ #ifndef __PPB_MSQ_H @@ -106,53 +106,53 @@ */ /* register operations */ -#define MS_RSET(reg,assert,clear) { MS_OP_RSET, { reg, assert, clear} } -#define MS_RASSERT(reg,byte) { MS_OP_RASSERT, { reg, byte } } -#define MS_RCLR(reg,clear) { MS_OP_RSET, { reg, MS_ASSERT_NONE, clear } } +#define MS_RSET(reg,assert,clear) { MS_OP_RSET, {{ reg }, { assert }, { clear }}} +#define MS_RASSERT(reg,byte) { MS_OP_RASSERT, { { reg }, { byte }}} +#define MS_RCLR(reg,clear) { MS_OP_RSET, {{ reg }, { MS_ASSERT_NONE }, { clear }}} -#define MS_RFETCH(reg,mask,ptr) { MS_OP_RFETCH, { reg, mask, ptr } } +#define MS_RFETCH(reg,mask,ptr) { MS_OP_RFETCH, {{ reg }, { mask }, { ptr }}} /* trigger the port with array[char, delay,...] */ -#define MS_TRIG(reg,len,array) { MS_OP_TRIG, { reg, len, array } } +#define MS_TRIG(reg,len,array) { MS_OP_TRIG, {{ reg }, { len }, { array }}} /* assert/fetch from/to ptr */ -#define MS_RASSERT_P(n,reg) { MS_OP_RASSERT_P, { n, reg } } -#define MS_RFETCH_P(n,reg,mask) { MS_OP_RFETCH_P, { n, reg, mask } } +#define MS_RASSERT_P(n,reg) { MS_OP_RASSERT_P, {{ n }, { reg }}} +#define MS_RFETCH_P(n,reg,mask) { MS_OP_RFETCH_P, {{ n }, { reg }, { mask }}} /* ptr manipulation */ -#define MS_PTR(ptr) { MS_OP_PTR, { { ptr } } } +#define MS_PTR(ptr) { MS_OP_PTR, {{ ptr }}} #define MS_DASS(byte) MS_RASSERT(MS_REG_DTR,byte) #define MS_SASS(byte) MS_RASSERT(MS_REG_STR,byte) #define MS_CASS(byte) MS_RASSERT(MS_REG_CTR,byte) -#define MS_SET(accum) { MS_OP_SET, { { accum } } } -#define MS_BRSET(mask,offset) { MS_OP_BRSET, { mask, offset } } -#define MS_DBRA(offset) { MS_OP_DBRA, { { offset } } } -#define MS_BRCLEAR(mask,offset) { MS_OP_BRCLEAR, { { mask }, { offset } } } +#define MS_SET(accum) { MS_OP_SET, {{ accum }}} +#define MS_BRSET(mask,offset) { MS_OP_BRSET, {{ mask }, { offset }}} +#define MS_DBRA(offset) { MS_OP_DBRA, {{ offset }}} +#define MS_BRCLEAR(mask,offset) { MS_OP_BRCLEAR, {{ mask }, { offset }}} #define MS_BRSTAT(mask_set,mask_clr,offset) \ - { MS_OP_BRSTAT, { mask_set, mask_clr, offset } } + { MS_OP_BRSTAT, {{ mask_set }, { mask_clr }, { offset }}} /* C function or submicrosequence call */ #define MS_C_CALL(function,parameter) \ - { MS_OP_C_CALL, { function, parameter } } -#define MS_CALL(microseq) { MS_OP_CALL, { { microseq } } } + { MS_OP_C_CALL, {{ function }, { parameter }}} +#define MS_CALL(microseq) { MS_OP_CALL, {{ microseq }}} /* mode dependent read/write operations * ppb_MS_xxx_init() call required otherwise default is * IEEE1284 operating mode */ -#define MS_PUT(ptr,len) { MS_OP_PUT, { ptr, len } } -#define MS_GET(ptr,len) { MS_OP_GET, { ptr, len } } +#define MS_PUT(ptr,len) { MS_OP_PUT, {{ ptr }, { len }}} +#define MS_GET(ptr,len) { MS_OP_GET, {{ ptr }, { len }}} /* delay in microseconds */ -#define MS_DELAY(udelay) { MS_OP_DELAY, { { udelay } } } +#define MS_DELAY(udelay) { MS_OP_DELAY, {{ udelay }}} /* asynchroneous delay in ms */ -#define MS_ADELAY(mdelay) { MS_OP_ADELAY, { { mdelay } } } +#define MS_ADELAY(mdelay) { MS_OP_ADELAY, {{ mdelay }}} /* return from submicrosequence execution or microseqence execution */ -#define MS_SUBRET(code) { MS_OP_SUBRET, { { code } } } -#define MS_RET(code) { MS_OP_RET, { { code } } } +#define MS_SUBRET(code) { MS_OP_SUBRET, {{ code }}} +#define MS_RET(code) { MS_OP_RET, {{ code }}} /* * Function abstraction level diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c index 65e3216..7301f97 100644 --- a/sys/dev/ppc/ppc.c +++ b/sys/dev/ppc/ppc.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ppc.c,v 1.15 1999/01/10 16:41:13 nsouch Exp $ + * $Id: ppc.c,v 1.16 1999/01/30 15:35:38 nsouch Exp $ * */ #include "ppc.h" @@ -605,7 +605,7 @@ static int ppc_smc37c66xgt_detect(struct ppc_data *ppc, int chipset_mode) { int s, i; - char r; + u_char r; int type = -1; int csr = SMC66x_CSR; /* initial value is 0x3F0 */ @@ -657,7 +657,7 @@ config: /* read the port's address: bits 0 and 1 of CR1 */ r = inb(cio) & SMC_CR1_ADDR; - if (port_address[r] != ppc->ppc_base) + if (port_address[(int)r] != ppc->ppc_base) return (-1); ppc->ppc_type = type; |