Module Name: src
Committed By: tsutsui
Date: Mon Apr 11 14:00:02 UTC 2011
Modified Files:
src/sys/arch/x68k/stand/libsa: chdsk.c consio.c consio.h devopen.c fd.c
sdcd.c sdcdvar.h
Log Message:
Some KNF. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x68k/stand/libsa/chdsk.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x68k/stand/libsa/consio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/libsa/consio.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/libsa/devopen.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x68k/stand/libsa/fd.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x68k/stand/libsa/sdcd.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/stand/libsa/sdcdvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/libsa/chdsk.c
diff -u src/sys/arch/x68k/stand/libsa/chdsk.c:1.3 src/sys/arch/x68k/stand/libsa/chdsk.c:1.4
--- src/sys/arch/x68k/stand/libsa/chdsk.c:1.3 Thu Apr 7 13:38:21 2011
+++ src/sys/arch/x68k/stand/libsa/chdsk.c Mon Apr 11 14:00:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chdsk.c,v 1.3 2011/04/07 13:38:21 isaki Exp $ */
+/* $NetBSD: chdsk.c,v 1.4 2011/04/11 14:00:02 tsutsui Exp $ */
/*
* Copyright (c) 2001 MINOURA Makoto.
@@ -36,6 +36,7 @@
int
changedisk_hook(struct open_file *f)
{
+
if (strcmp(f->f_dev->dv_name, "fd") == 0) {
struct fd_softc *sc = f->f_devdata;
int drive[2];
Index: src/sys/arch/x68k/stand/libsa/consio.c
diff -u src/sys/arch/x68k/stand/libsa/consio.c:1.6 src/sys/arch/x68k/stand/libsa/consio.c:1.7
--- src/sys/arch/x68k/stand/libsa/consio.c:1.6 Mon Apr 11 13:48:32 2011
+++ src/sys/arch/x68k/stand/libsa/consio.c Mon Apr 11 14:00:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consio.c,v 1.6 2011/04/11 13:48:32 tsutsui Exp $ */
+/* $NetBSD: consio.c,v 1.7 2011/04/11 14:00:02 tsutsui Exp $ */
/*
* Copyright (c) 2001 MINOURA Makoto.
@@ -42,12 +42,13 @@
int
consio_init(int device)
{
+
if (device < 0) { /* undetemined yet */
if (KEYCTRL & 8)
device = ITE;
else {
- IOCS_B_PRINT ("No keyboard; "
- "switching to serial console...");
+ IOCS_B_PRINT("No keyboard; "
+ "switching to serial console...");
device = SERIAL;
}
}
@@ -56,12 +57,12 @@
case ITE:
x68k_console_device = ITE;
/* set palette here */
- IOCS_OS_CURON ();
+ IOCS_OS_CURON();
break;
case SERIAL:
x68k_console_device = SERIAL;
- IOCS_OS_CUROF ();
- IOCS_SET232C (SERPARAM);
+ IOCS_OS_CUROF();
+ IOCS_SET232C(SERPARAM);
}
return x68k_console_device;
@@ -74,10 +75,10 @@
switch (x68k_console_device) {
case ITE:
- while ((r = IOCS_B_KEYINP () & 0xff) == 0);
+ while ((r = IOCS_B_KEYINP() & 0xff) == 0);
return r;
case SERIAL:
- while ((r = IOCS_INP232C () & 0xff) == 0);
+ while ((r = IOCS_INP232C() & 0xff) == 0);
return r;
}
@@ -87,14 +88,15 @@
void
putchar(int c)
{
+
if (c == '\n')
putchar('\r');
switch (x68k_console_device) {
case ITE:
- IOCS_B_PUTC (c);
+ IOCS_B_PUTC(c);
break;
case SERIAL:
- IOCS_OUT232C (c);
+ IOCS_OUT232C(c);
break;
}
}
@@ -102,11 +104,12 @@
int
check_getchar(void)
{
+
switch (x68k_console_device) {
case ITE:
- return IOCS_B_KEYSNS () & 0xff;
+ return IOCS_B_KEYSNS() & 0xff;
case SERIAL:
- return IOCS_ISNS232C () & 0xff;
+ return IOCS_ISNS232C() & 0xff;
}
return -1;
Index: src/sys/arch/x68k/stand/libsa/consio.h
diff -u src/sys/arch/x68k/stand/libsa/consio.h:1.2 src/sys/arch/x68k/stand/libsa/consio.h:1.3
--- src/sys/arch/x68k/stand/libsa/consio.h:1.2 Mon Apr 11 13:47:16 2011
+++ src/sys/arch/x68k/stand/libsa/consio.h Mon Apr 11 14:00:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consio.h,v 1.2 2011/04/11 13:47:16 tsutsui Exp $ */
+/* $NetBSD: consio.h,v 1.3 2011/04/11 14:00:02 tsutsui Exp $ */
/*
* Copyright (c) 2001 MINOURA Makoto.
@@ -26,13 +26,13 @@
*/
#define KEYCTRL_PHYS (0x00e8e000+7)
-#define KEYCTRL (*((volatile unsigned char *)KEYCTRL_PHYS))
+#define KEYCTRL (*((volatile uint8_t *)KEYCTRL_PHYS))
#define MFP_TIMERC_PHYS (0x00e88000+0x23)
-#define MFP_TIMERC (*((volatile unsigned char *)MFP_TIMERC_PHYS))
+#define MFP_TIMERC (*((volatile uint8_t *)MFP_TIMERC_PHYS))
#define JOYA_PHYS (0x00e9a000+1)
-#define JOYA (*((volatile unsigned char *)JOYA_PHYS))
+#define JOYA (*((volatile uint8_t *)JOYA_PHYS))
#define SRAM_PHYS 0x00ed0000
#define SERPARAM_PHYS (SRAM_PHYS + 26)
-#define SERPARAM (*((unsigned short *)SERPARAM_PHYS))
+#define SERPARAM (*((uint16_t *)SERPARAM_PHYS))
Index: src/sys/arch/x68k/stand/libsa/devopen.c
diff -u src/sys/arch/x68k/stand/libsa/devopen.c:1.4 src/sys/arch/x68k/stand/libsa/devopen.c:1.5
--- src/sys/arch/x68k/stand/libsa/devopen.c:1.4 Sun Nov 11 05:20:27 2007
+++ src/sys/arch/x68k/stand/libsa/devopen.c Mon Apr 11 14:00:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.4 2007/11/11 05:20:27 isaki Exp $ */
+/* $NetBSD: devopen.c,v 1.5 2011/04/11 14:00:02 tsutsui Exp $ */
/*
* Copyright (c) 2001 Minoura Makoto
@@ -91,17 +91,17 @@
error = devparse(fname, &dev, &unit, &part, file);
if (error)
- return error;
+ return error;
dp = &devsw[dev];
- if (!dp->dv_open)
+ if (dp->dv_open == NULL)
return ENODEV;
f->f_dev = dp;
if ((error = (*dp->dv_open)(f, unit, part)) == 0)
- return 0;
+ return 0;
return error;
}
Index: src/sys/arch/x68k/stand/libsa/fd.c
diff -u src/sys/arch/x68k/stand/libsa/fd.c:1.5 src/sys/arch/x68k/stand/libsa/fd.c:1.6
--- src/sys/arch/x68k/stand/libsa/fd.c:1.5 Sun Nov 18 05:00:08 2007
+++ src/sys/arch/x68k/stand/libsa/fd.c Mon Apr 11 14:00:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.5 2007/11/18 05:00:08 isaki Exp $ */
+/* $NetBSD: fd.c,v 1.6 2011/04/11 14:00:02 tsutsui Exp $ */
/*
* Copyright (c) 2001 MINOURA Makoto.
@@ -112,7 +112,7 @@
head = (dblk / nsect) % nhead + sc->fmt.minsec.H;
cyl = (dblk / nsect) / nhead + sc->fmt.minsec.C;
- error = IOCS_B_READ((sc->unit+0x90)*256 + 0x70,
+ error = IOCS_B_READ((sc->unit + 0x90) * 256 + 0x70,
((sc->fmt.minsec.N << 24) |
(cyl << 16) |
(head << 8) |
Index: src/sys/arch/x68k/stand/libsa/sdcd.c
diff -u src/sys/arch/x68k/stand/libsa/sdcd.c:1.8 src/sys/arch/x68k/stand/libsa/sdcd.c:1.9
--- src/sys/arch/x68k/stand/libsa/sdcd.c:1.8 Sun Nov 18 05:00:08 2007
+++ src/sys/arch/x68k/stand/libsa/sdcd.c Mon Apr 11 14:00:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sdcd.c,v 1.8 2007/11/18 05:00:08 isaki Exp $ */
+/* $NetBSD: sdcd.c,v 1.9 2011/04/11 14:00:02 tsutsui Exp $ */
/*
* Copyright (c) 2001 MINOURA Makoto.
@@ -126,8 +126,8 @@
if (error)
return error;
if (current_blklen > 4) {
- printf ("FATAL: Unsupported block size %d.\n",
- 256 << current_blklen);
+ printf("FATAL: Unsupported block size %d.\n",
+ 256 << current_blklen);
return ERDLAB;
}
@@ -268,6 +268,7 @@
int
sdclose(struct open_file *f)
{
+
dealloc(f->f_devdata, sizeof(struct sdcd_softc));
return 0;
}
@@ -277,7 +278,7 @@
void *buf, size_t *rsize)
{
struct sdcd_softc *sc = arg;
- u_int32_t start = sc->sc_partinfo.start + dblk;
+ uint32_t start = sc->sc_partinfo.start + dblk;
size_t nblks;
int error;
@@ -347,6 +348,7 @@
int
cdclose(struct open_file *f)
{
+
dealloc(f->f_devdata, sizeof(struct sdcd_softc));
return 0;
}
Index: src/sys/arch/x68k/stand/libsa/sdcdvar.h
diff -u src/sys/arch/x68k/stand/libsa/sdcdvar.h:1.1 src/sys/arch/x68k/stand/libsa/sdcdvar.h:1.2
--- src/sys/arch/x68k/stand/libsa/sdcdvar.h:1.1 Thu Sep 27 10:03:28 2001
+++ src/sys/arch/x68k/stand/libsa/sdcdvar.h Mon Apr 11 14:00:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sdcdvar.h,v 1.1 2001/09/27 10:03:28 minoura Exp $ */
+/* $NetBSD: sdcdvar.h,v 1.2 2011/04/11 14:00:02 tsutsui Exp $ */
/*
* Copyright (c) 2001 Minoura Makoto
@@ -30,6 +30,6 @@
#define BLKBYTES(len) (1 << ((len) + 8))
struct boot_partinfo {
- u_int32_t start; /* in blocks */
- u_int32_t size; /* in blocks */
+ uint32_t start; /* in blocks */
+ uint32_t size; /* in blocks */
};
