summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenji Aoyama <aoyama@cvs.openbsd.org>2017-11-03 09:07:55 +0000
committerKenji Aoyama <aoyama@cvs.openbsd.org>2017-11-03 09:07:55 +0000
commitb3f858de1767085e23bbabf383b31bcefe56ca47 (patch)
tree3976c608937eacb09c313af0776e6e6084af3de1
parent91fc26a2293b5cd8c6b2a5dbd84b71b24ad84a06 (diff)
Spaces -> tab, no binary change.
-rw-r--r--sys/arch/luna88k/luna88k/autoconf.c26
-rw-r--r--sys/arch/luna88k/luna88k/clock.c4
-rw-r--r--sys/arch/luna88k/luna88k/machdep.c36
-rw-r--r--sys/arch/luna88k/luna88k/mainbus.c8
4 files changed, 37 insertions, 37 deletions
diff --git a/sys/arch/luna88k/luna88k/autoconf.c b/sys/arch/luna88k/luna88k/autoconf.c
index 2a60498163f..19c0cb79f3c 100644
--- a/sys/arch/luna88k/luna88k/autoconf.c
+++ b/sys/arch/luna88k/luna88k/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.21 2014/04/22 22:58:02 aoyama Exp $ */
+/* $OpenBSD: autoconf.c,v 1.22 2017/11/03 09:07:54 aoyama Exp $ */
/*
* Copyright (c) 1998 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -42,7 +42,7 @@
#include <uvm/uvm.h>
-#include <machine/asm_macro.h> /* enable/disable interrupts */
+#include <machine/asm_macro.h> /* enable/disable interrupts */
#include <machine/autoconf.h>
#include <machine/cpu.h>
#include <machine/vmparam.h>
@@ -61,7 +61,7 @@
void dumpconf(void);
void get_autoboot_device(void);
-int cold = 1; /* 1 if still booting */
+int cold = 1; /* 1 if still booting */
void *bootaddr;
int bootpart;
@@ -157,24 +157,24 @@ get_autoboot_device(void)
void
device_register(struct device *dev, void *aux)
{
- /*
- * scsi: sd,cd XXX: Can LUNA-88K boot from CD-ROM?
- */
- if (strcmp("sd", dev->dv_cfdata->cf_driver->cd_name) == 0 ||
- strcmp("cd", dev->dv_cfdata->cf_driver->cd_name) == 0) {
+ /*
+ * scsi: sd,cd XXX: Can LUNA-88K boot from CD-ROM?
+ */
+ if (strcmp("sd", dev->dv_cfdata->cf_driver->cd_name) == 0 ||
+ strcmp("cd", dev->dv_cfdata->cf_driver->cd_name) == 0) {
struct scsi_attach_args *sa = aux;
struct device *spcsc;
spcsc = dev->dv_parent->dv_parent;
- if (strcmp(spcsc->dv_xname, autoboot.cont) == 0 &&
+ if (strcmp(spcsc->dv_xname, autoboot.cont) == 0 &&
sa->sa_sc_link->target == autoboot.targ &&
sa->sa_sc_link->lun == 0) {
- bootdv = dev;
+ bootdv = dev;
bootpart = autoboot.part;
- return;
- }
- }
+ return;
+ }
+ }
}
struct nam2blk nam2blk[] = {
diff --git a/sys/arch/luna88k/luna88k/clock.c b/sys/arch/luna88k/luna88k/clock.c
index 1742d421114..70f0b5c053a 100644
--- a/sys/arch/luna88k/luna88k/clock.c
+++ b/sys/arch/luna88k/luna88k/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.12 2017/03/19 10:57:29 miod Exp $ */
+/* $OpenBSD: clock.c,v 1.13 2017/11/03 09:07:54 aoyama Exp $ */
/* $NetBSD: clock.c,v 1.2 2000/01/11 10:29:35 nisimura Exp $ */
/*
@@ -187,7 +187,7 @@ inittodr(time_t base)
return;
printf("WARNING: clock %s %d days",
ts.tv_sec < base ? "lost" : "gained",
- (int) (deltat / SECDAY));
+ (int) (deltat / SECDAY));
}
bad:
printf(" -- CHECK AND RESET THE DATE!\n");
diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index 2c2ecd4f4b0..65884df7195 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.125 2017/05/29 14:19:50 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.126 2017/11/03 09:07:54 aoyama Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -149,7 +149,7 @@ struct fuse_rom_byte {
u_int32_t h;
u_int32_t l;
};
-#define FUSE_ROM_BYTES (FUSE_ROM_SPACE / sizeof(struct fuse_rom_byte))
+#define FUSE_ROM_BYTES (FUSE_ROM_SPACE / sizeof(struct fuse_rom_byte))
char fuse_rom_data[FUSE_ROM_BYTES];
#define NNVSYM 8
@@ -237,11 +237,11 @@ consinit()
* Initialize the console before we print anything out.
*/
if (sysconsole == 0) {
- syscnattach(0);
- } else {
- omfb_cnattach();
- ws_cnattach();
- }
+ syscnattach(0);
+ } else {
+ omfb_cnattach();
+ ws_cnattach();
+ }
#if defined(DDB)
db_machine_init();
@@ -327,9 +327,9 @@ cpu_startup()
machtype = LUNA_88K2;
}
- /* Determine the 'auto-boot' device from NVRAM data */
- get_nvram_data();
- get_autoboot_device();
+ /* Determine the 'auto-boot' device from NVRAM data */
+ get_nvram_data();
+ get_autoboot_device();
/*
* Good {morning,afternoon,evening,night}.
@@ -727,12 +727,12 @@ secondary_pre_main()
{
struct cpu_info *ci;
- /*
- * Invoke the CMMU initialization routine as early as possible,
- * so that we do not risk any memory writes to be lost during
- * cache setup.
- */
- cmmu_initialize_cpu(cmmu_cpu_number());
+ /*
+ * Invoke the CMMU initialization routine as early as possible,
+ * so that we do not risk any memory writes to be lost during
+ * cache setup.
+ */
+ cmmu_initialize_cpu(cmmu_cpu_number());
/*
* Now initialize your cpu_info structure.
@@ -1149,8 +1149,8 @@ get_fuse_rom_data(void)
for (i = 0; i < FUSE_ROM_BYTES; i++) {
fuse_rom_data[i] =
(char)((((p->h) >> 24) & 0x000000f0) |
- (((p->l) >> 28) & 0x0000000f));
- p++;
+ (((p->l) >> 28) & 0x0000000f));
+ p++;
}
}
diff --git a/sys/arch/luna88k/luna88k/mainbus.c b/sys/arch/luna88k/luna88k/mainbus.c
index f775ca5ada8..be6f852290b 100644
--- a/sys/arch/luna88k/luna88k/mainbus.c
+++ b/sys/arch/luna88k/luna88k/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.14 2017/02/08 13:13:15 aoyama Exp $ */
+/* $OpenBSD: mainbus.c,v 1.15 2017/11/03 09:07:54 aoyama Exp $ */
/* $NetBSD: mainbus.c,v 1.2 2000/01/07 05:13:08 nisimura Exp $ */
/*-
@@ -53,8 +53,8 @@ static const struct mainbus_attach_args devs[] = {
{ "xp", 0x71000000, 1, LUNA_88K|LUNA_88K2 }, /* HD647180XP */
{ "fb", 0xc1100000, -1, LUNA_88K|LUNA_88K2 }, /* BrookTree RAMDAC */
{ "spc", 0xe1000000, 3, LUNA_88K|LUNA_88K2 }, /* MB89352 */
- { "spc", 0xe1000040, 3, LUNA_88K2 }, /* ditto, LUNA-88K2 only */
- { "cbus", 0x91000000, 4, LUNA_88K2 }, /* PC-9801 extension slot */
+ { "spc", 0xe1000040, 3, LUNA_88K2 }, /* ditto, LUNA-88K2 only */
+ { "cbus", 0x91000000, 4, LUNA_88K2 }, /* PC-9801 extension slot */
};
void mainbus_attach(struct device *, struct device *, void *);
@@ -69,7 +69,7 @@ const struct cfattach mainbus_ca = {
};
struct cfdriver mainbus_cd = {
- NULL, "mainbus", DV_DULL, 0
+ NULL, "mainbus", DV_DULL, 0
};
int