diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2011-07-08 08:26:42 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2011-07-08 08:26:42 +0000 |
commit | 0862b1eef08fddca9627bed690963cd6d39f139e (patch) | |
tree | 013d96db99aef19755e74b57944b2f4a67ebab6f /sys | |
parent | 5eb16bed8c5763bf167ca2cb4509b4118a55e243 (diff) |
ansi, no binary change
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/ic/gdtvar.h | 23 | ||||
-rw-r--r-- | sys/dev/isa/isavar.h | 11 | ||||
-rw-r--r-- | sys/ufs/ext2fs/ext2fs_dir.h | 5 |
3 files changed, 12 insertions, 27 deletions
diff --git a/sys/dev/ic/gdtvar.h b/sys/dev/ic/gdtvar.h index d2cd6c9567a..ef3e8dc071f 100644 --- a/sys/dev/ic/gdtvar.h +++ b/sys/dev/ic/gdtvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gdtvar.h,v 1.19 2011/04/19 23:59:11 krw Exp $ */ +/* $OpenBSD: gdtvar.h,v 1.20 2011/07/08 08:26:41 jsg Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -253,9 +253,7 @@ struct gdt_ccb { static inline int gdt_ccb_set_cmd(struct gdt_ccb *, int); static inline int -gdt_ccb_set_cmd(ccb, flag) - struct gdt_ccb *ccb; - int flag; +gdt_ccb_set_cmd(struct gdt_ccb *ccb, int flag) { int rv = ccb->gc_flags & GDT_GCF_CMD_MASK; @@ -412,38 +410,31 @@ static inline u_int16_t gdt_dec16(u_int8_t *); static inline u_int32_t gdt_dec32(u_int8_t *); static inline void -gdt_enc16(addr, value) - u_int8_t *addr; - u_int16_t value; +gdt_enc16(u_int8_t *addr, u_int16_t value) { *(u_int16_t *)addr = htole16(value); } static inline void -gdt_enc32(addr, value) - u_int8_t *addr; - u_int32_t value; +gdt_enc32(u_int8_t *addr, u_int32_t value) { *(u_int32_t *)addr = htole32(value); } static inline u_int8_t -gdt_dec8(addr) - u_int8_t *addr; +gdt_dec8(u_int8_t *addr) { return *(u_int8_t *)addr; } static inline u_int16_t -gdt_dec16(addr) - u_int8_t *addr; +gdt_dec16(u_int8_t *addr) { return letoh16(*(u_int16_t *)addr); } static inline u_int32_t -gdt_dec32(addr) - u_int8_t *addr; +gdt_dec32(u_int8_t *addr) { return letoh32(*(u_int32_t *)addr); } diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h index 2622d9383f7..06cab5eee01 100644 --- a/sys/dev/isa/isavar.h +++ b/sys/dev/isa/isavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isavar.h,v 1.56 2011/07/07 19:16:42 deraadt Exp $ */ +/* $OpenBSD: isavar.h,v 1.57 2011/07/08 08:26:41 jsg Exp $ */ /* $NetBSD: isavar.h,v 1.26 1997/06/06 23:43:57 thorpej Exp $ */ /*- @@ -402,19 +402,14 @@ static __inline void isapnp_write_reg(struct isapnp_softc *, int, u_char); static __inline u_char isapnp_read_reg(struct isapnp_softc *, int); static __inline void -isapnp_write_reg(sc, r, v) - struct isapnp_softc *sc; - int r; - u_char v; +isapnp_write_reg(struct isapnp_softc *sc, int r, u_char v) { ISAPNP_WRITE_ADDR(sc, r); ISAPNP_WRITE_DATA(sc, v); } static __inline u_char -isapnp_read_reg(sc, r) - struct isapnp_softc *sc; - int r; +isapnp_read_reg(struct isapnp_softc *sc, int r) { ISAPNP_WRITE_ADDR(sc, r); return ISAPNP_READ_DATA(sc); diff --git a/sys/ufs/ext2fs/ext2fs_dir.h b/sys/ufs/ext2fs/ext2fs_dir.h index cba7981e028..c4660f0aa0e 100644 --- a/sys/ufs/ext2fs/ext2fs_dir.h +++ b/sys/ufs/ext2fs/ext2fs_dir.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_dir.h,v 1.7 2003/06/02 23:28:22 millert Exp $ */ +/* $OpenBSD: ext2fs_dir.h,v 1.8 2011/07/08 08:26:41 jsg Exp $ */ /* $NetBSD: ext2fs_dir.h,v 1.4 2000/01/28 16:00:23 bouyer Exp $ */ /* @@ -104,8 +104,7 @@ struct ext2fs_direct { static __inline__ u_int8_t inot2ext2dt(u_int16_t) __attribute__((__unused__)); static __inline__ u_int8_t -inot2ext2dt(type) - u_int16_t type; +inot2ext2dt(u_int16_t type) { switch(type) { case E2IFTODT(EXT2_IFIFO): |