Module Name: src
Committed By: tsutsui
Date: Sat Jan 11 15:51:02 UTC 2014
Modified Files:
src/sys/arch/luna68k/stand/boot: bmc.c bmd.c cons.c disklabel.c
getline.c if_le.c init_main.c kbd.c kbdreg.h lance.c locore.S
machdep.c omron_disklabel.h parse.c preset.h rcvbuf.h romcons.c
sc.c screen.c scsi.c sd.c sioreg.h ufs_disksubr.c
Log Message:
Misc KNF and cosmetics.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/bmc.c \
src/sys/arch/luna68k/stand/boot/scsi.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/bmd.c \
src/sys/arch/luna68k/stand/boot/disklabel.c \
src/sys/arch/luna68k/stand/boot/getline.c \
src/sys/arch/luna68k/stand/boot/omron_disklabel.h \
src/sys/arch/luna68k/stand/boot/ufs_disksubr.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/cons.c \
src/sys/arch/luna68k/stand/boot/kbd.c \
src/sys/arch/luna68k/stand/boot/kbdreg.h \
src/sys/arch/luna68k/stand/boot/lance.c \
src/sys/arch/luna68k/stand/boot/machdep.c \
src/sys/arch/luna68k/stand/boot/preset.h \
src/sys/arch/luna68k/stand/boot/rcvbuf.h \
src/sys/arch/luna68k/stand/boot/romcons.c \
src/sys/arch/luna68k/stand/boot/screen.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/stand/boot/if_le.c \
src/sys/arch/luna68k/stand/boot/parse.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/luna68k/stand/boot/init_main.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/luna68k/stand/boot/locore.S \
src/sys/arch/luna68k/stand/boot/sc.c src/sys/arch/luna68k/stand/boot/sd.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/sioreg.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/luna68k/stand/boot/bmc.c
diff -u src/sys/arch/luna68k/stand/boot/bmc.c:1.4 src/sys/arch/luna68k/stand/boot/bmc.c:1.5
--- src/sys/arch/luna68k/stand/boot/bmc.c:1.4 Mon Jan 21 11:58:12 2013
+++ src/sys/arch/luna68k/stand/boot/bmc.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bmc.c,v 1.4 2013/01/21 11:58:12 tsutsui Exp $ */
+/* $NetBSD: bmc.c,v 1.5 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -88,6 +88,7 @@
void
bmccnprobe(struct consdev *cp)
{
+
if ((dipsw1 & PS_BMC_CONS) == 0) {
cp->cn_pri = CN_DEAD;
return;
@@ -106,6 +107,7 @@ bmccnprobe(struct consdev *cp)
void
bmccninit(struct consdev *cp)
{
+
sioinit();
bmdinit();
}
@@ -121,14 +123,16 @@ bmccngetc(dev_t dev)
POP_RBUF(unit, c);
- return(c);
-/*
- return(siocngetc(dev));
- */
+#if 1
+ return c ;
+#else
+ return siocngetc(dev);
+#endif
}
void
bmccnputc(dev_t dev, int c)
{
+
bmdputc(c);
}
Index: src/sys/arch/luna68k/stand/boot/scsi.c
diff -u src/sys/arch/luna68k/stand/boot/scsi.c:1.4 src/sys/arch/luna68k/stand/boot/scsi.c:1.5
--- src/sys/arch/luna68k/stand/boot/scsi.c:1.4 Fri Jan 3 07:17:19 2014
+++ src/sys/arch/luna68k/stand/boot/scsi.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi.c,v 1.4 2014/01/03 07:17:19 tsutsui Exp $ */
+/* $NetBSD: scsi.c,v 1.5 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -109,7 +109,7 @@ scsi(int argc, char *argv[])
if (argc < 2) {
printf("This command is required subcommand !!\n");
- return(ST_ERROR);
+ return ST_ERROR;
}
if (!strcmp(argv[1], "device")) {
@@ -131,22 +131,22 @@ scsi(int argc, char *argv[])
scsi_request_sense( 0, scsi_device, 0, sensbuff, SENSBUFF);
} else if (!strcmp(argv[1], "inquiry")) {
if (scsi_immed_command( 0, scsi_device, 0, &inquiry,
- (u_char *) &inquirybuf, sizeof(inquirybuf)) == 0) {
+ (u_char *)&inquirybuf, sizeof(inquirybuf)) == 0) {
printf("Type:\t0x%x\n", inquirybuf.type);
printf("Qualifier:\t0x%x\n", inquirybuf.qual);
printf("Version:\t0x%x\n", inquirybuf.version);
printf("RDF:\t0x%x\n", inquirybuf.rsvd);
-
+
printf("Vender ID:\t");
for (i = 0; i < 8; i++)
printf("%c", inquirybuf.vendor_id[i]);
printf("\n");
-
+
printf("Product ID:\t");
for (i = 0; i < 16; i++)
printf("%c", inquirybuf.product_id[i]);
printf("\n");
-
+
printf("Revision:\t");
for (i = 0; i < 4; i++)
printf("%c", inquirybuf.rev[i]);
@@ -154,7 +154,7 @@ scsi(int argc, char *argv[])
}
} else if (!strcmp(argv[1], "read_capacity")) {
if (scsi_immed_command( 0, scsi_device, 0, &capacity,
- (u_char *) &capacitybuf, sizeof(capacitybuf)) == 0) {
+ (u_char *)&capacitybuf, sizeof(capacitybuf)) == 0) {
printf("Logical Block Address:\t%ld (0x%lx)\n",
capacitybuf[0], capacitybuf[0]);
printf("Block Length:\t\t%ld (0x%lx)\n",
@@ -172,11 +172,12 @@ scsi(int argc, char *argv[])
} else if (!strcmp(argv[1], "format_unit")) {
i = 0;
while (i == 0) {
- printf("Do you really want to format SCSI %d device ? [y/n]: ",
- scsi_device);
+ printf("Do you really want to format SCSI %d device ?"
+ " [y/n]: ", scsi_device);
i = getchar();
printf("\n");
- if ((i != 'y') && (i != 'Y') && (i != 'n') && (i != 'N'))
+ if ((i != 'y') && (i != 'Y') &&
+ (i != 'n') && (i != 'N'))
i = 0;
}
@@ -184,7 +185,7 @@ scsi(int argc, char *argv[])
status = scsi_format_unit( 0, scsi_device, 0);
}
- return(ST_NORMAL);
+ return ST_NORMAL;
}
static struct scsi_generic_cdb scsi_cdb = {
@@ -198,27 +199,27 @@ scsi_read_raw(u_int target, u_int blk, u
struct scsi_generic_cdb *cdb = &scsi_cdb;
cdb->cdb[0] = CMD_READ_EXT;
-
+
cdb->cdb[2] = (blk & 0xff000000) >> 24;
cdb->cdb[3] = (blk & 0x00ff0000) >> 16;
cdb->cdb[4] = (blk & 0x0000ff00) >> 8;
cdb->cdb[5] = (blk & 0x000000ff);
-
+
cdb->cdb[7] = (nblk & 0xff00) >> 8;
cdb->cdb[8] = (nblk & 0x00ff);
-
+
if (scsi_immed_command(0, target, 0, cdb, buff, len) == 0)
- return(1);
+ return 1;
else
- return(0);
+ return 0;
}
int
scsi_read(u_int blk, u_char *buff, u_int len)
{
u_int nblk = len >> DEV_BSHIFT;
-
- return(scsi_read_raw(scsi_device, blk, nblk, buff, len));
+
+ return scsi_read_raw(scsi_device, blk, nblk, buff, len);
}
int
@@ -227,17 +228,17 @@ scsi_write(u_int blk, u_char *buff, u_in
struct scsi_generic_cdb *cdb = &scsi_cdb;
cdb->cdb[0] = CMD_WRITE_EXT;
-
+
cdb->cdb[2] = (blk & 0xff000000) >> 24;
cdb->cdb[3] = (blk & 0x00ff0000) >> 16;
cdb->cdb[4] = (blk & 0x0000ff00) >> 8;
cdb->cdb[5] = (blk & 0x000000ff);
-
+
cdb->cdb[7] = ((len >> DEV_BSHIFT) & 0xff00) >> 8;
cdb->cdb[8] = ((len >> DEV_BSHIFT) & 0x00ff);
-
+
if (scsi_immed_command(0, scsi_device, 0, cdb, buff, len) == 0)
- return(1);
+ return 1;
else
- return(0);
+ return 0;
}
Index: src/sys/arch/luna68k/stand/boot/bmd.c
diff -u src/sys/arch/luna68k/stand/boot/bmd.c:1.3 src/sys/arch/luna68k/stand/boot/bmd.c:1.4
--- src/sys/arch/luna68k/stand/boot/bmd.c:1.3 Thu Jan 2 20:02:00 2014
+++ src/sys/arch/luna68k/stand/boot/bmd.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bmd.c,v 1.3 2014/01/02 20:02:00 tsutsui Exp $ */
+/* $NetBSD: bmd.c,v 1.4 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -113,8 +113,8 @@ union bmd_rfcnt {
#define FB_HEIGHT 20 /* Font Hight (Bit) */
-#define NEXT_LINE(addr) ( addr + (PL_WIDTH * FB_HEIGHT) )
-#define SKIP_NEXT_LINE(addr) ( addr += (PL_WIDTH - SL_WIDTH) )
+#define NEXT_LINE(addr) (addr + (PL_WIDTH * FB_HEIGHT))
+#define SKIP_NEXT_LINE(addr) (addr += (PL_WIDTH - SL_WIDTH))
void bmd_draw_char(char *, char *, int, int, int);
@@ -279,7 +279,7 @@ bmd_escape_1(int c)
void
bmdinit(void)
{
- volatile uint32_t *bmd_rfcnt = (uint32_t *) 0xB1000000;
+ volatile uint32_t *bmd_rfcnt = (uint32_t *)0xB1000000;
volatile long *bmd_bmsel = (long *)0xB1040000;
struct bmd_softc *bp = &bmd_softc;
struct bmd_linec *bq;
@@ -290,8 +290,8 @@ bmdinit(void)
* adjust plane position
*/
- bp->bc_raddr = (char *) 0xB10C0008; /* plane-0 hardware address */
- bp->bc_waddr = (char *) 0xB1080008; /* common bitmap hardware address */
+ bp->bc_raddr = (char *)0xB10C0008; /* plane-0 hardware address */
+ bp->bc_waddr = (char *)0xB1080008; /* common bitmap hardware address */
rfcnt.p.rfc_hcnt = 7; /* shift left 16 dot */
rfcnt.p.rfc_vcnt = -27; /* shift down 1 dot */
*bmd_rfcnt = rfcnt.u;
@@ -306,11 +306,11 @@ bmdinit(void)
bp->bc_row = bp->bc_ymin;
for (i = bp->bc_ymin; i < bp->bc_ymax; i++) {
- bmd_linec[i].bl_next = &bmd_linec[i+1];
- bmd_linec[i].bl_prev = &bmd_linec[i-1];
+ bmd_linec[i].bl_next = &bmd_linec[i + 1];
+ bmd_linec[i].bl_prev = &bmd_linec[i - 1];
}
- bmd_linec[bp->bc_ymax-1].bl_next = &bmd_linec[bp->bc_ymin];
- bmd_linec[bp->bc_ymin].bl_prev = &bmd_linec[bp->bc_ymax-1];
+ bmd_linec[bp->bc_ymax - 1].bl_next = &bmd_linec[bp->bc_ymin];
+ bmd_linec[bp->bc_ymin].bl_prev = &bmd_linec[bp->bc_ymax - 1];
bq = bp->bc_bl = &bmd_linec[bp->bc_ymin];
bq->bl_col = bq->bl_end = bp->bc_xmin;
@@ -333,7 +333,7 @@ bmdinit(void)
void
bmdadjust(short hcnt, short vcnt)
{
- volatile uint32_t *bmd_rfcnt = (uint32_t *) 0xB1000000;
+ volatile uint32_t *bmd_rfcnt = (uint32_t *)0xB1000000;
union bmd_rfcnt rfcnt;
printf("bmdadjust: hcnt = %d, vcnt = %d\n", hcnt, vcnt);
@@ -437,7 +437,7 @@ bmdputc(int c)
bp->bc_waddr,
bq->bl_col, bp->bc_row);
- return(c);
+ return c;
}
void
Index: src/sys/arch/luna68k/stand/boot/disklabel.c
diff -u src/sys/arch/luna68k/stand/boot/disklabel.c:1.3 src/sys/arch/luna68k/stand/boot/disklabel.c:1.4
--- src/sys/arch/luna68k/stand/boot/disklabel.c:1.3 Tue Jan 22 15:48:40 2013
+++ src/sys/arch/luna68k/stand/boot/disklabel.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.3 2013/01/22 15:48:40 tsutsui Exp $ */
+/* $NetBSD: disklabel.c,v 1.4 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -104,7 +104,7 @@ dkcksum(struct disklabel *lp)
end = (u_short *)&lp->d_partitions[lp->d_npartitions];
while (start < end)
sum ^= *start++;
- return (sum);
+ return sum;
}
#endif
@@ -121,7 +121,7 @@ disklabel(int argc, char *argv[])
if (argc < 2) {
printf("This command is required sub command !!\n");
- return(ST_ERROR);
+ return ST_ERROR;
}
if (!strcmp(argv[1], "help")) {
@@ -131,7 +131,8 @@ disklabel(int argc, char *argv[])
printf("\twrite:\t\twrite disklabel to scsi_device\n");
printf("\tomron:\t\tshow OMRON disklabel infomation\n");
printf("\tbsd:\t\tshow BSD disklabel infomation\n");
- printf("\tcopy:\t\tcopy disklabel infomation from OMRON to BSD\n");
+ printf("\tcopy:\t\tcopy disklabel infomation from OMRON"
+ " to BSD\n");
printf("\tchecksum:\tdoing checksum\n");
printf("\tset:\t\tchange BSD disklabel infomation\n");
printf("\n\n");
@@ -146,29 +147,37 @@ disklabel(int argc, char *argv[])
i -= (int) lbl_buff;
printf("Offset = %d\n", i);
printf("\n");
- printf("Checksum of Bad Track:\t0x%x\n", omp->dkl_badchk);
- printf("Logical Block Total:\t%u(0x%x)\n", omp->dkl_maxblk, omp->dkl_maxblk);
- printf("Disk Drive Type:\t0x%x\n", omp->dkl_dtype);
- printf("Number of Disk Drives:\t%d(0x%x)\n", omp->dkl_ndisk, omp->dkl_ndisk);
- printf("Number of Data Cylinders:\t%d(0x%x)\n", omp->dkl_ncyl, omp->dkl_ncyl);
+ printf("Checksum of Bad Track:\t0x%x\n",
+ omp->dkl_badchk);
+ printf("Logical Block Total:\t%u(0x%x)\n",
+ omp->dkl_maxblk, omp->dkl_maxblk);
+ printf("Disk Drive Type:\t0x%x\n",
+ omp->dkl_dtype);
+ printf("Number of Disk Drives:\t%d(0x%x)\n",
+ omp->dkl_ndisk, omp->dkl_ndisk);
+ printf("Number of Data Cylinders:\t%d(0x%x)\n",
+ omp->dkl_ncyl, omp->dkl_ncyl);
printf("Number of Alternate Cylinders:\t%d(0x%x)\n",
- omp->dkl_acyl,omp->dkl_acyl);
+ omp->dkl_acyl,omp->dkl_acyl);
printf("Number of Heads in This Partition:\t%d(0x%x)\n",
- omp->dkl_nhead, omp->dkl_nhead);
+ omp->dkl_nhead, omp->dkl_nhead);
printf("Number of 512 byte Sectors per Track:\t%d(0x%x)\n",
- omp->dkl_nsect, omp->dkl_nsect);
+ omp->dkl_nsect, omp->dkl_nsect);
printf("Identifies Proper Label Locations:\t0x%x\n",
- omp->dkl_bhead);
+ omp->dkl_bhead);
printf("Physical Partition Number:\t%d(0x%x)\n",
- omp->dkl_ppart, omp->dkl_ppart);
+ omp->dkl_ppart, omp->dkl_ppart);
for (i = 0; i < NLPART; i++)
printf("\t%d:\t%d\t%d\n", i,
- omp->dkl_map[i].dkl_blkno, omp->dkl_map[i].dkl_nblk);
- printf("Identifies This Label Format:\t0x%x\n", omp->dkl_magic);
- printf("XOR Checksum of Sector:\t0x%x\n", omp->dkl_cksum);
+ omp->dkl_map[i].dkl_blkno,
+ omp->dkl_map[i].dkl_nblk);
+ printf("Identifies This Label Format:\t0x%x\n",
+ omp->dkl_magic);
+ printf("XOR Checksum of Sector:\t0x%x\n",
+ omp->dkl_cksum);
} else if (!strcmp(argv[1], "checksum")) {
if (omp->dkl_magic == DKL_MAGIC){
- /* checksum of disk-label */
+ /* checksum of disk-label */
chksum = 0;
count = sizeof(struct scd_dk_label) / sizeof(short int);
for (p= (u_short *) lbl_buff; count > 0; count--) {
@@ -209,8 +218,10 @@ disklabel(int argc, char *argv[])
bp->d_sbsize = SBSIZE;
for (i = 0; i < MAXPARTITIONS; i++) {
- bp->d_partitions[i].p_size = omp->dkl_map[i].dkl_nblk;
- bp->d_partitions[i].p_offset = omp->dkl_map[i].dkl_blkno;
+ bp->d_partitions[i].p_size =
+ omp->dkl_map[i].dkl_nblk;
+ bp->d_partitions[i].p_offset =
+ omp->dkl_map[i].dkl_blkno;
bp->d_partitions[i].p_fsize = 1024;
bp->d_partitions[i].p_frag = 8192 / 1024;
bp->d_partitions[i].p_fstype = FS_UNUSED;
@@ -254,7 +265,8 @@ disklabel(int argc, char *argv[])
}
switch (*argv[2]) {
case 'b':
- bp->d_partitions[i].p_frag = j / bp->d_partitions[i].p_fsize;
+ bp->d_partitions[i].p_frag =
+ j / bp->d_partitions[i].p_fsize;
break;
case 'f': /* fragment size */
bp->d_partitions[i].p_fsize = j;
@@ -281,7 +293,7 @@ disklabel(int argc, char *argv[])
/* restump checksum of OMRON disklabel */
chksum = 0;
count = sizeof(struct scd_dk_label) / sizeof(short int);
- for (p= (u_short *) lbl_buff; count > 1; count--) {
+ for (p = (u_short *)lbl_buff; count > 1; count--) {
chksum ^= *p++;
}
omp->dkl_cksum = chksum;
@@ -289,10 +301,10 @@ disklabel(int argc, char *argv[])
} else if (!strcmp(argv[1], "sb")) {
#define BLOCK_SIZE SBSIZE
- printf("checking Super Block: block size = %d bytes, seek amount = 1 blocks\n",
- BLOCK_SIZE);
+ printf("checking Super Block: block size = %d bytes,"
+ " seek amount = 1 blocks\n", BLOCK_SIZE);
i = j = 0;
- while(1) {
+ while (1) {
if (!scsi_read( i, lbl_buff, BLOCK_SIZE))
break;
@@ -305,7 +317,7 @@ disklabel(int argc, char *argv[])
} else if (!strcmp(argv[1], "sbcopy")) {
if (!scsi_read(32, lbl_buff, BLOCK_SIZE)) {
printf("sbcopy: read failed\n");
- return(ST_ERROR);
+ return ST_ERROR;
}
if (scsi_write(16, lbl_buff, BLOCK_SIZE)) {
printf("sbcopy: copy done\n");
@@ -314,7 +326,7 @@ disklabel(int argc, char *argv[])
}
}
- return(ST_NORMAL);
+ return ST_NORMAL;
}
void
Index: src/sys/arch/luna68k/stand/boot/getline.c
diff -u src/sys/arch/luna68k/stand/boot/getline.c:1.3 src/sys/arch/luna68k/stand/boot/getline.c:1.4
--- src/sys/arch/luna68k/stand/boot/getline.c:1.3 Fri Jan 3 06:37:13 2014
+++ src/sys/arch/luna68k/stand/boot/getline.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: getline.c,v 1.3 2014/01/03 06:37:13 tsutsui Exp $ */
+/* $NetBSD: getline.c,v 1.4 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -72,7 +72,7 @@
/*
* getline -- simple getline function
- * by A.Fujita, Dec-11-1992
+ * by A.Fujita, Dec-11-1992
*/
#include <lib/libkern/libkern.h>
Index: src/sys/arch/luna68k/stand/boot/omron_disklabel.h
diff -u src/sys/arch/luna68k/stand/boot/omron_disklabel.h:1.3 src/sys/arch/luna68k/stand/boot/omron_disklabel.h:1.4
--- src/sys/arch/luna68k/stand/boot/omron_disklabel.h:1.3 Tue Jan 22 15:48:40 2013
+++ src/sys/arch/luna68k/stand/boot/omron_disklabel.h Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: omron_disklabel.h,v 1.3 2013/01/22 15:48:40 tsutsui Exp $ */
+/* $NetBSD: omron_disklabel.h,v 1.4 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -74,26 +74,26 @@
/* by A.Fujita, JAN-30-1992 */
-#define DKL_MAGIC 0xDABE /* Disk label Magic number */
-#define NLPART 8 /* # of logical partition */
+#define DKL_MAGIC 0xDABE /* Disk label Magic number */
+#define NLPART 8 /* # of logical partition */
struct scd_dk_label {
- char dkl_asciilabel[128]; /* for compatibility */
- char dkl_pad[512-(128+8*8+11*2+4)];
- uint16_t dkl_badchk; /* checksum of bad track */
- uint32_t dkl_maxblk; /* # of total logical block */
- uint16_t dkl_dtype; /* disk drive type */
- uint16_t dkl_ndisk; /* # of disk drives */
- uint16_t dkl_ncyl; /* # of data cylinders */
- uint16_t dkl_acyl; /* # of alternate cylinders */
- uint16_t dkl_nhead; /* # of heads in this partition */
- uint16_t dkl_nsect; /* # of 512 byte sectors per track */
- uint16_t dkl_bhead; /* identifies proper label locations */
- uint16_t dkl_ppart; /* physical partition # */
- struct dk_map { /* logical partitions */
- int32_t dkl_blkno; /* starting block */
- int32_t dkl_nblk; /* number of blocks */
+ char dkl_asciilabel[128]; /* for compatibility */
+ char dkl_pad[512 - (128 + (8 * 8) + (11 * 2) + 4)];
+ uint16_t dkl_badchk; /* checksum of bad track */
+ uint32_t dkl_maxblk; /* # of total logical block */
+ uint16_t dkl_dtype; /* disk drive type */
+ uint16_t dkl_ndisk; /* # of disk drives */
+ uint16_t dkl_ncyl; /* # of data cylinders */
+ uint16_t dkl_acyl; /* # of alternate cylinders */
+ uint16_t dkl_nhead; /* # of heads in this partition */
+ uint16_t dkl_nsect; /* # of 512 byte sectors per track */
+ uint16_t dkl_bhead; /* identifies proper label locations */
+ uint16_t dkl_ppart; /* physical partition # */
+ struct dk_map { /* logical partitions */
+ int32_t dkl_blkno; /* starting block */
+ int32_t dkl_nblk; /* number of blocks */
} dkl_map[NLPART];
- uint16_t dkl_magic; /* identifies this label format */
- uint16_t dkl_cksum; /* xor checksum of sector */
+ uint16_t dkl_magic; /* identifies this label format */
+ uint16_t dkl_cksum; /* xor checksum of sector */
};
Index: src/sys/arch/luna68k/stand/boot/ufs_disksubr.c
diff -u src/sys/arch/luna68k/stand/boot/ufs_disksubr.c:1.3 src/sys/arch/luna68k/stand/boot/ufs_disksubr.c:1.4
--- src/sys/arch/luna68k/stand/boot/ufs_disksubr.c:1.3 Fri Jan 3 07:17:19 2014
+++ src/sys/arch/luna68k/stand/boot/ufs_disksubr.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_disksubr.c,v 1.3 2014/01/03 07:17:19 tsutsui Exp $ */
+/* $NetBSD: ufs_disksubr.c,v 1.4 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -112,7 +112,8 @@ readdisklabel(int ctlr, int id, struct d
for (dlp = (struct disklabel *)bp;
dlp <= (struct disklabel *)(bp + DEV_BSIZE - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
- if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
+ if (dlp->d_magic != DISKMAGIC ||
+ dlp->d_magic2 != DISKMAGIC) {
if (msg == NULL)
msg = "no disk label";
} else if (dlp->d_npartitions > MAXPARTITIONS ||
@@ -126,5 +127,5 @@ readdisklabel(int ctlr, int id, struct d
}
}
- return (msg);
+ return msg;
}
Index: src/sys/arch/luna68k/stand/boot/cons.c
diff -u src/sys/arch/luna68k/stand/boot/cons.c:1.1 src/sys/arch/luna68k/stand/boot/cons.c:1.2
--- src/sys/arch/luna68k/stand/boot/cons.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/cons.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: cons.c,v 1.2 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -127,8 +127,8 @@ int
cngetc(void)
{
if (cn_tab == NULL)
- return(0);
- return((*cn_tab->cn_getc)(cn_tab->cn_dev));
+ return 0;
+ return (*cn_tab->cn_getc)(cn_tab->cn_dev);
}
void
Index: src/sys/arch/luna68k/stand/boot/kbd.c
diff -u src/sys/arch/luna68k/stand/boot/kbd.c:1.1 src/sys/arch/luna68k/stand/boot/kbd.c:1.2
--- src/sys/arch/luna68k/stand/boot/kbd.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/kbd.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: kbd.c,v 1.2 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -227,13 +227,13 @@ kbd_decode(u_char code)
c = kbd_keymap[code].km_type;
if (c == KC_IGNORE)
- return(KC_IGNORE);
+ return KC_IGNORE;
if ((c == KC_CODE) && updown)
- return(KC_IGNORE);
+ return KC_IGNORE;
if (c == KC_SHIFT) {
- switch(kbd_keymap[code].km_code[0]) {
+ switch (kbd_keymap[code].km_code[0]) {
case KS_SHIFT:
shift_flag = 1 - updown;
@@ -248,7 +248,7 @@ kbd_decode(u_char code)
break;
}
- return(KC_IGNORE);
+ return KC_IGNORE;
}
if (shift_flag)
@@ -262,5 +262,5 @@ kbd_decode(u_char code)
if (ctrl_flag)
c &= 0x1F;
- return(c);
+ return c;
}
Index: src/sys/arch/luna68k/stand/boot/kbdreg.h
diff -u src/sys/arch/luna68k/stand/boot/kbdreg.h:1.1 src/sys/arch/luna68k/stand/boot/kbdreg.h:1.2
--- src/sys/arch/luna68k/stand/boot/kbdreg.h:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/kbdreg.h Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdreg.h,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: kbdreg.h,v 1.2 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -82,9 +82,9 @@ struct kbd_keymap {
#define KC_CHAR 0x000000FF
#define KC_TYPE 0x0000FF00
-#define KC_CODE 0x00000000
-#define KC_SHIFT 0x00000100
-#define KC_IGNORE 0x0000FF00
+#define KC_CODE 0x00000000
+#define KC_SHIFT 0x00000100
+#define KC_IGNORE 0x0000FF00
#define KS_SHIFT 0
#define KS_CTRL 1
Index: src/sys/arch/luna68k/stand/boot/lance.c
diff -u src/sys/arch/luna68k/stand/boot/lance.c:1.1 src/sys/arch/luna68k/stand/boot/lance.c:1.2
--- src/sys/arch/luna68k/stand/boot/lance.c:1.1 Sun Jan 13 14:10:55 2013
+++ src/sys/arch/luna68k/stand/boot/lance.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lance.c,v 1.1 2013/01/13 14:10:55 tsutsui Exp $ */
+/* $NetBSD: lance.c,v 1.2 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 2013 Izumi Tsutsui. All rights reserved.
@@ -154,7 +154,7 @@ lance_get(void *cookie, void *data, size
rmd = &lemem->lem_rmd[sc->sc_currmd];
if ((rmd->rmd1_bits & LE_R1_OWN) != 0)
return -1;
-
+
csr = lereg->ler_rdp;
#if 0
if ((csr & LE_C0_ERR) != 0)
@@ -313,7 +313,7 @@ lance_do_initialize(struct le_softc *sc)
}
DELAY(1);
} while ((reg & LE_C0_IDON) == 0);
-
+
lereg->ler_rap = LE_CSR0;
lereg->ler_rdp = LE_C0_STRT | LE_C0_IDON;
Index: src/sys/arch/luna68k/stand/boot/machdep.c
diff -u src/sys/arch/luna68k/stand/boot/machdep.c:1.1 src/sys/arch/luna68k/stand/boot/machdep.c:1.2
--- src/sys/arch/luna68k/stand/boot/machdep.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/machdep.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.2 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -91,16 +91,16 @@ badaddr(volatile void *addr)
label_t faultbuf;
#ifdef lint
- i = *addr; if (i) return(0);
+ i = *addr; if (i) return 0;
#endif
nofault = (int *) &faultbuf;
if (setjmp((label_t *)nofault)) {
- nofault = (int *) 0;
- return(1);
+ nofault = NULL;
+ return 1;
}
i = *(volatile short *)addr;
- nofault = (int *) 0;
- return(0);
+ nofault = NULL;
+ return 0;
}
void
@@ -114,17 +114,19 @@ regdump(int *rp /* must not be register
return;
s = splhigh();
doingdump = 1;
-/* printf("pid = %d, pc = %s, ", u.u_procp->p_pid, hexstr(rp[PC], 8)); */
+#if 0
+ printf("pid = %d, pc = %s, ", u.u_procp->p_pid, hexstr(rp[PC], 8));
+#endif
printf("pc = %s, ", hexstr(rp[PC], 8));
printf("ps = %s, ", hexstr(rp[PS], 4));
printf("sfc = %s, ", hexstr(getsfc(), 4));
printf("dfc = %s\n", hexstr(getdfc(), 4));
-/*
+#if 0
printf("p0 = %x@%s, ",
u.u_pcb.pcb_p0lr, hexstr((int)u.u_pcb.pcb_p0br, 8));
printf("p1 = %x@%s\n\n",
u.u_pcb.pcb_p1lr, hexstr((int)u.u_pcb.pcb_p1br, 8));
-*/
+#endif
printf("Registers:\n ");
for (i = 0; i < 8; i++)
printf(" %d", i);
@@ -135,16 +137,18 @@ regdump(int *rp /* must not be register
for (i = 0; i < 8; i++)
printf(" %s", hexstr(rp[i+8], 8));
if (sbytes > 0) {
-/* if (rp[PS] & PSL_S) { */
+#if 0
+ if (rp[PS] & PSL_S) {
+#endif
printf("\n\nKernel stack (%s):",
- hexstr((int)(((int *)&rp)-1), 8));
- dumpmem(((int *)&rp)-1, sbytes, 0);
-/*
+ hexstr((int)(((int *)&rp) - 1), 8));
+ dumpmem(((int *)&rp) - 1, sbytes, 0);
+#if 0
} else {
printf("\n\nUser stack (%s):", hexstr(rp[SP], 8));
dumpmem((int *)rp[SP], sbytes, 1);
}
-*/
+#endif
}
doingdump = 0;
splx(s);
@@ -162,16 +166,19 @@ dumpmem(int *ptr, int sz, int ustack)
printf("\n%s: ", hexstr((int)ptr, 6));
else
printf(" ");
-/*
+#if 0
if (ustack == 1) {
if ((val = fuword(ptr++)) == -1)
break;
} else {
- if (ustack == 0 && (ptr < KSADDR || ptr > KSADDR+(NBPG/4-1)))
+ if (ustack == 0 &&
+ (ptr < KSADDR || ptr > KSADDR+(NBPG/4-1)))
break;
-*/
+#endif
val = *ptr++;
-/* } */
+#if 0
+ }
+#endif
printf("%s", hexstr(val, 8));
}
printf("\n");
@@ -184,7 +191,7 @@ hexstr(int val, int len)
int x, i;
if (len > 8)
- return("");
+ return "";
nbuf[len] = '\0';
for (i = len-1; i >= 0; --i) {
x = val & 0xF;
@@ -194,5 +201,5 @@ hexstr(int val, int len)
nbuf[i] = x + '0';
val >>= 4;
}
- return(nbuf);
+ return nbuf;
}
Index: src/sys/arch/luna68k/stand/boot/preset.h
diff -u src/sys/arch/luna68k/stand/boot/preset.h:1.1 src/sys/arch/luna68k/stand/boot/preset.h:1.2
--- src/sys/arch/luna68k/stand/boot/preset.h:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/preset.h Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: preset.h,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: preset.h,v 1.2 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -79,14 +79,16 @@
* DIP SW-1
*/
-#define PS_AUTOBOOT 0x01 /* 1: PROM auto-boot */
-#define PS_BMC_CONS 0x02 /* 2: use bitmap display as console */
-#define PS_BW_DISP 0x04 /* 3: use B&W display (unused) */
- /* 4: HD write verify (???) */
-#define PS_COFF 0x10 /* 5: boot COFF format kernel */
-#define PS_PLAIN 0x20 /* 6: number of bitmap plain (unused) */
- /* NOTE: it has 4 plain, if turn it on, else 1 */
- /* 7: boot device (unused) */
- /* NOTE: it should be net-booting, if turn it on */
- /* 8: load diagnostic program (unused) */
+#define PS_AUTOBOOT 0x01 /* 1: PROM auto-boot */
+#define PS_BMC_CONS 0x02 /* 2: use bitmap display as console */
+#define PS_BW_DISP 0x04 /* 3: use B&W display (unused) */
+ /* 4: HD write verify (???) */
+#define PS_COFF 0x10 /* 5: boot COFF format kernel */
+#define PS_PLAIN 0x20 /* 6: number of bitmap plain (unused) */
+ /* NOTE: it has 4 plain, if turn it on,
+ else 1 */
+ /* 7: boot device (unused) */
+ /* NOTE: it should be net-booting,
+ if turn it on */
+ /* 8: load diagnostic program (unused) */
Index: src/sys/arch/luna68k/stand/boot/rcvbuf.h
diff -u src/sys/arch/luna68k/stand/boot/rcvbuf.h:1.1 src/sys/arch/luna68k/stand/boot/rcvbuf.h:1.2
--- src/sys/arch/luna68k/stand/boot/rcvbuf.h:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/rcvbuf.h Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rcvbuf.h,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: rcvbuf.h,v 1.2 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -80,25 +80,28 @@
struct rcvbuf {
u_char * volatile rb_push;
u_char * volatile rb_pop;
- u_char rb_buf[RBUF_SIZE+4];
+ u_char rb_buf[RBUF_SIZE + 4];
};
-#define RBUF_INIT(n) rcvbuf[n].rb_pop = rcvbuf[n].rb_push = &rcvbuf[n].rb_buf[RBUF_SIZE]
+#define RBUF_INIT(n) \
+do { \
+ rcvbuf[n].rb_pop = rcvbuf[n].rb_push = &rcvbuf[n].rb_buf[RBUF_SIZE]; \
+} while (/* CONSTCOND */0)
#define PUSH_RBUF(n, c) \
do { \
- *(--rcvbuf[n].rb_push) = c ; \
+ *(--rcvbuf[n].rb_push) = (c); \
if (rcvbuf[n].rb_push == rcvbuf[n].rb_buf) \
rcvbuf[n].rb_push = &rcvbuf[n].rb_buf[RBUF_SIZE]; \
} while (/* CONSTCOND */0)
#define POP_RBUF(n, c) \
do { \
- c= *(--rcvbuf[n].rb_pop); \
+ (c) = *(--rcvbuf[n].rb_pop); \
if (rcvbuf[n].rb_pop == rcvbuf[n].rb_buf) \
rcvbuf[n].rb_pop = &rcvbuf[n].rb_buf[RBUF_SIZE]; \
-} while (0)
+} while (/* CONSTCOND */0)
-#define RBUF_EMPTY(n) (rcvbuf[n].rb_push == rcvbuf[n].rb_pop ? 1: 0)
+#define RBUF_EMPTY(n) (rcvbuf[n].rb_push == rcvbuf[n].rb_pop)
extern struct rcvbuf rcvbuf[];
Index: src/sys/arch/luna68k/stand/boot/romcons.c
diff -u src/sys/arch/luna68k/stand/boot/romcons.c:1.1 src/sys/arch/luna68k/stand/boot/romcons.c:1.2
--- src/sys/arch/luna68k/stand/boot/romcons.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/romcons.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: romcons.c,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: romcons.c,v 1.2 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -80,6 +80,7 @@
void
romcnprobe(struct consdev *cp)
{
+
cp->cn_dev = 0;
cp->cn_pri = CN_NORMAL;
}
@@ -98,11 +99,12 @@ romcngetc(dev_t dev)
if ((c = ROM_getchar()) != -1)
break;
- return(c);
+ return c;
}
void
romcnputc(dev_t dev, int c)
{
+
ROM_putchar(c);
}
Index: src/sys/arch/luna68k/stand/boot/screen.c
diff -u src/sys/arch/luna68k/stand/boot/screen.c:1.1 src/sys/arch/luna68k/stand/boot/screen.c:1.2
--- src/sys/arch/luna68k/stand/boot/screen.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/screen.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: screen.c,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: screen.c,v 1.2 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -128,5 +128,5 @@ screen(int argc, char *argv[])
}
}
- return(ST_NORMAL);
+ return ST_NORMAL;
}
Index: src/sys/arch/luna68k/stand/boot/if_le.c
diff -u src/sys/arch/luna68k/stand/boot/if_le.c:1.5 src/sys/arch/luna68k/stand/boot/if_le.c:1.6
--- src/sys/arch/luna68k/stand/boot/if_le.c:1.5 Fri Jan 10 11:12:03 2014
+++ src/sys/arch/luna68k/stand/boot/if_le.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.5 2014/01/10 11:12:03 tsutsui Exp $ */
+/* $NetBSD: if_le.c,v 1.6 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 2013 Izumi Tsutsui. All rights reserved.
@@ -205,12 +205,12 @@ le_put(struct iodesc *desc, void *pkt, s
struct netif_dif *dif = &nif->nif_driver->netif_ifs[nif->nif_unit];
void *cookie = dif->dif_private;
#ifdef DEBUG
- struct ether_header *eh;
+ struct ether_header *eh;
- eh = pkt;
- printf("dst: %s\n", ether_sprintf(eh->ether_dhost));
- printf("src: %s\n", ether_sprintf(eh->ether_shost));
- printf("type: 0x%x\n", eh->ether_type & 0xffff);
+ eh = pkt;
+ printf("dst: %s\n", ether_sprintf(eh->ether_dhost));
+ printf("src: %s\n", ether_sprintf(eh->ether_shost));
+ printf("type: 0x%x\n", eh->ether_type & 0xffff);
#endif
return lance_put(cookie, pkt, len) ? len : -1;
Index: src/sys/arch/luna68k/stand/boot/parse.c
diff -u src/sys/arch/luna68k/stand/boot/parse.c:1.5 src/sys/arch/luna68k/stand/boot/parse.c:1.6
--- src/sys/arch/luna68k/stand/boot/parse.c:1.5 Sat Jan 11 08:08:23 2014
+++ src/sys/arch/luna68k/stand/boot/parse.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.5 2014/01/11 08:08:23 tsutsui Exp $ */
+/* $NetBSD: parse.c,v 1.6 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -86,16 +86,17 @@ check_args(int argc, char *argv[])
{
int i;
- for ( i = 0; i < argc; i++)
+ for (i = 0; i < argc; i++)
printf("argv[%d] = \"%s\"\n", i, argv[i]);
- return(ST_NORMAL);
+ return ST_NORMAL;
}
int
exit_program(int argc, char *argv[])
{
- return(ST_EXIT);
+
+ return ST_EXIT;
}
static const char helpmsg[] =
@@ -148,7 +149,7 @@ struct command_entry entries[] = {
#endif
{ "scsi", scsi },
{ "quit", exit_program },
- { 0, 0 }
+ { NULL, NULL }
};
@@ -157,14 +158,14 @@ parse(int argc, char *argv[])
{
int i, status = ST_NOTFOUND;
- for (i = 0; entries[i].name != (char *) 0; i++) {
+ for (i = 0; entries[i].name != NULL; i++) {
if (!strcmp(argv[0], entries[i].name)) {
status = (*entries[i].func)(argc, argv);
break;
}
}
- return(status);
+ return status;
}
@@ -181,14 +182,14 @@ getargs(char buffer[], char *argv[], int
argv[n++] = p;
while (*p != '\0') {
- if ( *p == ' ' ) {
+ if (*p == ' ') {
*p = '\0';
- } else if (p != buffer && *(p-1) == '\0') {
- if ( n < maxargs )
+ } else if (p != buffer && *(p - 1) == '\0') {
+ if (n < maxargs)
argv[n++] = p;
}
p++;
}
- return(n);
+ return n;
}
Index: src/sys/arch/luna68k/stand/boot/init_main.c
diff -u src/sys/arch/luna68k/stand/boot/init_main.c:1.12 src/sys/arch/luna68k/stand/boot/init_main.c:1.13
--- src/sys/arch/luna68k/stand/boot/init_main.c:1.12 Sat Jan 11 14:35:15 2014
+++ src/sys/arch/luna68k/stand/boot/init_main.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.12 2014/01/11 14:35:15 tsutsui Exp $ */
+/* $NetBSD: init_main.c,v 1.13 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -170,7 +170,7 @@ struct luna2_bootinfo {
void
main(void)
{
- int i, status = 0;
+ int i, status = ST_NORMAL;
const char *machstr;
const char *bootdev;
uint32_t howto;
@@ -192,7 +192,7 @@ main(void)
hz = 100;
}
- nplane = get_plane_numbers();
+ nplane = get_plane_numbers();
cninit();
@@ -311,13 +311,15 @@ main(void)
do {
memset(buffer, 0, BUFFSIZE);
if (getline(prompt, buffer) > 0) {
- argc = getargs(buffer, argv, sizeof(argv)/sizeof(char *));
+ argc = getargs(buffer, argv,
+ sizeof(argv) / sizeof(char *));
status = parse(argc, argv);
if (status == ST_NOTFOUND)
- printf("Command \"%s\" is not found !!\n", argv[0]);
+ printf("Command \"%s\" is not found !!\n",
+ argv[0]);
}
- } while(status != ST_EXIT);
+ } while (status != ST_EXIT);
exit(0);
}
@@ -332,7 +334,7 @@ get_plane_numbers(void)
if (r & 0x1)
n++;
- return(n);
+ return n;
}
int
@@ -351,5 +353,5 @@ reorder_dipsw(int dipsw)
dipsw >>= 1;
}
- return(sw);
+ return sw;
}
Index: src/sys/arch/luna68k/stand/boot/locore.S
diff -u src/sys/arch/luna68k/stand/boot/locore.S:1.9 src/sys/arch/luna68k/stand/boot/locore.S:1.10
--- src/sys/arch/luna68k/stand/boot/locore.S:1.9 Tue Jan 22 15:48:40 2013
+++ src/sys/arch/luna68k/stand/boot/locore.S Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.9 2013/01/22 15:48:40 tsutsui Exp $ */
+/* $NetBSD: locore.S,v 1.10 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -154,13 +154,13 @@ ASGLOBAL(Reset)
VECTOR(illinst) /* 45: TRAP instruction vector */
VECTOR(illinst) /* 45: TRAP instruction vector */
VECTOR(illinst) /* 47: TRAP instruction vector */
- VECTOR(fptrap) /* 48: FPCP branch/set on unordered cond */
- VECTOR(fptrap) /* 49: FPCP inexact result */
- VECTOR(fptrap) /* 50: FPCP divide by zero */
- VECTOR(fptrap) /* 51: FPCP underflow */
- VECTOR(fptrap) /* 52: FPCP operand error */
- VECTOR(fptrap) /* 53: FPCP overflow */
- VECTOR(fptrap) /* 54: FPCP signalling NAN */
+ VECTOR(fptrap) /* 48: FPCP branch/set on unordered cond */
+ VECTOR(fptrap) /* 49: FPCP inexact result */
+ VECTOR(fptrap) /* 50: FPCP divide by zero */
+ VECTOR(fptrap) /* 51: FPCP underflow */
+ VECTOR(fptrap) /* 52: FPCP operand error */
+ VECTOR(fptrap) /* 53: FPCP overflow */
+ VECTOR(fptrap) /* 54: FPCP signalling NAN */
VECTOR(badtrap) /* 55: unassigned, reserved */
VECTOR(badtrap) /* 56: unassigned, reserved */
@@ -222,7 +222,7 @@ Lbssclr:
movl %d0,%a0@ |
movl #_ASM_LABEL(Reset),%a0 | BP vbr to %a0
movl #_C_LABEL(exit),%a0@(NMIVEC) | save address
-
+
/* switch vector tabel */
movec %vbr,%a0
@@ -496,14 +496,14 @@ ENTRY_NOPROFILE(badtrap)
* All device interrupts are auto-vectored. Most can be configured
* to interrupt in the range IPL2 to IPL6. Here are our assignments:
*
- * Level 0:
- * Level 1:
+ * Level 0:
+ * Level 1:
* Level 2: SCSI SPC
- * Level 3:
- * Level 4:
+ * Level 3: LANCE Ethernet
+ * Level 4:
* Level 5: System Clock
* Level 6: Internal SIO used uPD7201A
- * Level 7: Non-maskable: Abort Key (Dispatched vector to ROM monitor)
+ * Level 7: NMI: Abort Key (Dispatched vector to ROM monitor)
*/
ENTRY_NOPROFILE(lev2intr)
Index: src/sys/arch/luna68k/stand/boot/sc.c
diff -u src/sys/arch/luna68k/stand/boot/sc.c:1.9 src/sys/arch/luna68k/stand/boot/sc.c:1.10
--- src/sys/arch/luna68k/stand/boot/sc.c:1.9 Fri Jan 10 11:12:03 2014
+++ src/sys/arch/luna68k/stand/boot/sc.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sc.c,v 1.9 2014/01/10 11:12:03 tsutsui Exp $ */
+/* $NetBSD: sc.c,v 1.10 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -132,7 +132,7 @@ scinit(int ctlr, void *addr)
for (id = 0; id < 7; id++)
scprobe(hs, id, 0);
- return(1);
+ return 1;
}
void
@@ -273,6 +273,7 @@ scprobe(struct scsi_softc *hs, uint targ
int
issue_select(struct scsidevice *hd, u_char target)
{
+
hd->scsi_pctl = 0;
hd->scsi_temp = (1 << SCSI_ID) | (1 << target);
@@ -283,7 +284,7 @@ issue_select(struct scsidevice *hd, u_ch
hd->scsi_scmd = SCMD_SELECT;
- return (1);
+ return 1;
}
@@ -301,6 +302,7 @@ issue_select(struct scsidevice *hd, u_ch
void
ixfer_start(struct scsidevice *hd, int len, u_char phase, int wait)
{
+
hd->scsi_tch = ((len & 0xff0000) >> 16);
hd->scsi_tcm = ((len & 0x00ff00) >> 8);
hd->scsi_tcl = (len & 0x0000ff);
@@ -311,7 +313,8 @@ ixfer_start(struct scsidevice *hd, int l
void
ixfer_out(struct scsidevice *hd, int len, u_char *buf)
{
- for(; len > 0; len--) {
+
+ for (; len > 0; len--) {
while (hd->scsi_ssts & SSTS_DREG_FULL) {
DELAY(5);
}
@@ -322,6 +325,7 @@ ixfer_out(struct scsidevice *hd, int len
void
ixfer_in(struct scsidevice *hd, int len, u_char *buf)
{
+
for (; len > 0; len--) {
while (hd->scsi_ssts & SSTS_DREG_EMPTY) {
DELAY(5);
@@ -351,7 +355,7 @@ scrun(int ctlr, int target, u_char *cdb,
return 0;
if (hd->scsi_ssts & (SSTS_INITIATOR|SSTS_TARGET|SSTS_BUSY))
- return(0);
+ return 0;
hs->sc_flags = 0;
hs->sc_phase = ARB_SEL_PHASE;
@@ -369,7 +373,7 @@ scrun(int ctlr, int target, u_char *cdb,
*(hs->sc_lock) = SC_IN_PROGRESS;
issue_select(hd, hs->sc_target);
- return(1);
+ return 1;
}
int
@@ -391,7 +395,7 @@ scfinish(int ctlr)
hs->sc_stat = 0;
hs->sc_msg[0] = 0;
- return(status);
+ return status;
}
void
@@ -420,7 +424,7 @@ scabort(struct scsi_softc *hs)
hd->scsi_scmd = SCMD_SET_ATN;
while ((hd->scsi_psns & PSNS_REQ) == 0) {
- if (! (hd->scsi_ssts & SSTS_INITIATOR))
+ if ((hd->scsi_ssts & SSTS_INITIATOR) == 0)
goto out;
DELAY(1);
}
@@ -478,7 +482,7 @@ scsi_test_unit_rdy(int ctlr, int target,
#ifdef DEBUG
printf("scsi_test_unit_rdy: Command Transfer Failed.\n");
#endif
- return(-1);
+ return -1;
}
while ((lock == SC_IN_PROGRESS) || (lock == SC_DISCONNECTED))
@@ -490,9 +494,9 @@ scsi_test_unit_rdy(int ctlr, int target,
#ifdef DEBUG
printf("scsi_test_unit_rdy: Status -- 0x%x\n", status);
#endif
- return(status);
+ return status;
} else {
- return(lock);
+ return lock;
}
}
@@ -522,7 +526,7 @@ scsi_request_sense(int ctlr, int target,
#ifdef DEBUG
printf("scsi_request_sense: Command Transfer Failed.\n");
#endif
- return(-1);
+ return -1;
}
while ((lock == SC_IN_PROGRESS) || (lock == SC_DISCONNECTED))
@@ -534,9 +538,9 @@ scsi_request_sense(int ctlr, int target,
#ifdef DEBUG
printf("scsi_request_sense: Status -- 0x%x\n", status);
#endif
- return(status);
+ return status;
} else {
- return(lock);
+ return lock;
}
}
@@ -554,11 +558,12 @@ scsi_immed_command(int ctlr, int target,
cdb->cdb[1] |= lun << 5;
- if (!(scrun(ctlr, target, (void *)&cdb->cdb[0], cdb->len, buf, len, &lock))) {
+ if (!(scrun(ctlr, target, (void *)&cdb->cdb[0], cdb->len, buf, len,
+ &lock))) {
#ifdef DEBUG
printf("scsi_immed_command: Command Transfer Failed.\n");
#endif
- return(-1);
+ return -1;
}
while ((lock == SC_IN_PROGRESS) || (lock == SC_DISCONNECTED))
@@ -570,9 +575,9 @@ scsi_immed_command(int ctlr, int target,
#ifdef DEBUG
printf("scsi_immed_command: Status -- 0x%x\n", status);
#endif
- return(status);
+ return status;
} else {
- return(lock);
+ return lock;
}
}
@@ -596,7 +601,7 @@ scsi_format_unit(int ctlr, int target, i
#ifdef DEBUG
printf("scsi_format_unit: Command Transfer Failed.\n");
#endif
- return(-1);
+ return -1;
}
while ((lock == SC_IN_PROGRESS) || (lock == SC_DISCONNECTED)) {
@@ -613,9 +618,9 @@ scsi_format_unit(int ctlr, int target, i
#ifdef DEBUG
printf("scsi_format_unit: Status -- 0x%x\n", status);
#endif
- return(status);
+ return status;
} else {
- return(lock);
+ return lock;
}
}
@@ -666,7 +671,8 @@ scintr(void)
} else
goto abort;
} else if (ints & INTS_DISCON) {
- if ((hs->sc_msg[0] == MSG_CMD_COMPLETE) || (hs->sc_msg[0] == MSG_DISCONNECT)) {
+ if ((hs->sc_msg[0] == MSG_CMD_COMPLETE) ||
+ (hs->sc_msg[0] == MSG_DISCONNECT)) {
hs->sc_phase = BUS_FREE_PHASE;
hs->sc_target = SCSI_ID;
if (hs->sc_msg[0] == MSG_CMD_COMPLETE)
@@ -730,7 +736,8 @@ scintr(void)
hs->sc_phase = hd->scsi_psns & PHASE;
- if ((hs->sc_phase == DATA_OUT_PHASE) || (hs->sc_phase == DATA_IN_PHASE)) {
+ if ((hs->sc_phase == DATA_OUT_PHASE) ||
+ (hs->sc_phase == DATA_IN_PHASE)) {
len = hs->sc_len;
buf = hs->sc_buf;
} else if (hs->sc_phase == CMD_PHASE) {
Index: src/sys/arch/luna68k/stand/boot/sd.c
diff -u src/sys/arch/luna68k/stand/boot/sd.c:1.9 src/sys/arch/luna68k/stand/boot/sd.c:1.10
--- src/sys/arch/luna68k/stand/boot/sd.c:1.9 Fri Jan 10 11:12:03 2014
+++ src/sys/arch/luna68k/stand/boot/sd.c Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.9 2014/01/10 11:12:03 tsutsui Exp $ */
+/* $NetBSD: sd.c,v 1.10 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -114,13 +114,13 @@ sdident(struct sd_softc *sc)
if (sc->sc_blksize != DEV_BSIZE) {
if (sc->sc_blksize < DEV_BSIZE) {
- return (-1);
+ return -1;
}
for (i = sc->sc_blksize; i > DEV_BSIZE; i >>= 1)
++sc->sc_bshift;
sc->sc_blks <<= sc->sc_bshift;
}
- return(inqbuf.type);
+ return inqbuf.type;
}
struct sd_softc *
@@ -184,9 +184,9 @@ sdopen(struct open_file *f, ...)
va_end(ap);
if (unit < 0 || CTLR(unit) >= 2 || TARGET(unit) >= 7)
- return(-1);
+ return -1;
if (part < 0 || part >= MAXPARTITIONS)
- return(-1);
+ return -1;
sc = sdinit(unit);
if (sc == NULL)
@@ -258,7 +258,8 @@ sdstrategy(void *devdata, int func, dadd
#ifdef DEBUG
printf("sdstrategy: unit = %d\n", sc->sc_unit);
- printf("sdstrategy: blk = %lu (0x%lx), nblk = %u (0x%x)\n", (u_long)blk, (long)blk, nblk, nblk);
+ printf("sdstrategy: blk = %lu (0x%lx), nblk = %u (0x%x)\n",
+ (u_long)blk, (long)blk, nblk, nblk);
for (i = 0; i < 10; i++)
printf("sdstrategy: cdb[%d] = 0x%x\n", i, cdb->cdb[i]);
printf("sdstrategy: ctlr = %d, target = %d\n", sc->sc_ctlr, sc->sc_tgt);
Index: src/sys/arch/luna68k/stand/boot/sioreg.h
diff -u src/sys/arch/luna68k/stand/boot/sioreg.h:1.2 src/sys/arch/luna68k/stand/boot/sioreg.h:1.3
--- src/sys/arch/luna68k/stand/boot/sioreg.h:1.2 Sat Jan 12 07:04:57 2013
+++ src/sys/arch/luna68k/stand/boot/sioreg.h Sat Jan 11 15:51:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sioreg.h,v 1.2 2013/01/12 07:04:57 tsutsui Exp $ */
+/* $NetBSD: sioreg.h,v 1.3 2014/01/11 15:51:02 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -84,10 +84,10 @@ struct siodevice {
#define splsio spl6
-#define REG(u, r) ( (u << 4) | r )
-#define CHANNEL(r) ( r >> 4 )
-#define REGNO(r) ( r & 0x07 )
-#define isStatusReg(r) ( r & 0x08 )
+#define REG(u, r) (((u) << 4) | (r))
+#define CHANNEL(r) ((r) >> 4)
+#define REGNO(r) ((r) & 0x07)
+#define isStatusReg(r) ((r) & 0x08)
#define WR0 0x00
#define WR1 0x01
