diff options
author | gibbs <gibbs@FreeBSD.org> | 1996-03-10 07:04:27 +0000 |
---|---|---|
committer | gibbs <gibbs@FreeBSD.org> | 1996-03-10 07:04:27 +0000 |
commit | 11e0a995aaf4c458dd109d138aa1b9d1941adca1 (patch) | |
tree | 1ed5ac6b0acc99f35ab2cc07f1569e695ee0de7b | |
parent | 14667740f164aaf89daca80174e3c8234bae4f54 (diff) | |
download | FreeBSD-src-11e0a995aaf4c458dd109d138aa1b9d1941adca1.zip FreeBSD-src-11e0a995aaf4c458dd109d138aa1b9d1941adca1.tar.gz |
aha1742.c:
Cleanse the SCSI subsystem of its internally defined types
u_int32, u_int16, u_int8, int32, int16, int8.
Use the system defined *_t types instead.
eisaconf.c:
Cosmetic formatting chagnes.
-rw-r--r-- | sys/dev/eisa/eisaconf.c | 8 | ||||
-rw-r--r-- | sys/i386/eisa/aha1742.c | 10 | ||||
-rw-r--r-- | sys/i386/eisa/eisaconf.c | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c index 881eb2d..fa7f9eb 100644 --- a/sys/dev/eisa/eisaconf.c +++ b/sys/dev/eisa/eisaconf.c @@ -18,7 +18,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: eisaconf.c,v 1.15 1996/01/31 18:46:36 gibbs Exp $ + * $Id: eisaconf.c,v 1.16 1996/02/26 01:01:41 gibbs Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -146,7 +146,7 @@ eisa_configure() * be responsible for creating the list of devices in the system * for the configuration manager to use. */ - e_dev->full_name = (char *)malloc(10*sizeof(char), + e_dev->full_name = (char *)malloc(8*sizeof(char), M_DEVBUF, M_NOWAIT); if (!e_dev->full_name) { panic("Eisa probe unable to malloc"); @@ -335,14 +335,14 @@ eisa_reg_print(e_dev, string, separator) { int len = strlen(string); - if( separator ) + if(separator) len++; if(reg_state.column + len > MAX_COL) { printf("\n"); reg_state.column = 0; } - else if( separator ) { + else if(separator) { printf("%c", *separator); reg_state.column++; } diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c index 054da89..cb38e70 100644 --- a/sys/i386/eisa/aha1742.c +++ b/sys/i386/eisa/aha1742.c @@ -14,7 +14,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aha1742.c,v 1.50 1996/01/31 18:02:16 gibbs Exp $ + * $Id: aha1742.c,v 1.51 1996/02/26 01:01:38 gibbs Exp $ */ #include <sys/types.h> @@ -260,7 +260,7 @@ struct ahb_data { int numecbs; }; -static u_int32 ahb_adapter_info __P((int unit)); +static u_int32_t ahb_adapter_info __P((int unit)); static struct ahb_data * ahb_alloc __P((int unit, u_long iobase, int irq)); static int ahb_attach __P((struct eisa_device *dev)); @@ -284,7 +284,7 @@ static void ahb_print_ecb __P((struct ecb *ecb)); #endif static int ahbprobe __P((void)); static int ahb_reset __P((u_long port)); -static int32 ahb_scsi_cmd __P((struct scsi_xfer *xs)); +static int32_t ahb_scsi_cmd __P((struct scsi_xfer *xs)); static void ahb_send_immed __P((struct ahb_data *ahb, int target, u_long cmd)); static void ahb_send_mbox __P((struct ahb_data *ahb, int opcode, int target, @@ -688,7 +688,7 @@ ahb_bus_attach(ahb) * Return some information to the caller about * the adapter and it's capabilities */ -static u_int32 +static u_int32_t ahb_adapter_info(unit) int unit; { @@ -1027,7 +1027,7 @@ ahbminphys(bp) * the data address. Also needs the unit, target * and lu */ -static int32 +static int32_t ahb_scsi_cmd(xs) struct scsi_xfer *xs; { diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c index 881eb2d..fa7f9eb 100644 --- a/sys/i386/eisa/eisaconf.c +++ b/sys/i386/eisa/eisaconf.c @@ -18,7 +18,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: eisaconf.c,v 1.15 1996/01/31 18:46:36 gibbs Exp $ + * $Id: eisaconf.c,v 1.16 1996/02/26 01:01:41 gibbs Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -146,7 +146,7 @@ eisa_configure() * be responsible for creating the list of devices in the system * for the configuration manager to use. */ - e_dev->full_name = (char *)malloc(10*sizeof(char), + e_dev->full_name = (char *)malloc(8*sizeof(char), M_DEVBUF, M_NOWAIT); if (!e_dev->full_name) { panic("Eisa probe unable to malloc"); @@ -335,14 +335,14 @@ eisa_reg_print(e_dev, string, separator) { int len = strlen(string); - if( separator ) + if(separator) len++; if(reg_state.column + len > MAX_COL) { printf("\n"); reg_state.column = 0; } - else if( separator ) { + else if(separator) { printf("%c", *separator); reg_state.column++; } |