summaryrefslogtreecommitdiff
path: root/sys/arch/vax
diff options
context:
space:
mode:
authorThierry Deval <tdeval@cvs.openbsd.org>2005-03-08 20:00:26 +0000
committerThierry Deval <tdeval@cvs.openbsd.org>2005-03-08 20:00:26 +0000
commita3b0f021e679b876995e38de16c0b865bc44ab59 (patch)
tree20d73509f6c7f00e0b3ac537162723c42132864c /sys/arch/vax
parent89319c327aab18dce2217d74aae8d08141d38ac8 (diff)
Cosmetics...
Mainly remove space between locators parens, replace spaces with tabs where appropriate and consistently align dependencies.
Diffstat (limited to 'sys/arch/vax')
-rw-r--r--sys/arch/vax/conf/files.vax260
-rw-r--r--sys/arch/vax/dec/files.dec14
-rw-r--r--sys/arch/vax/qbus/files.uba14
3 files changed, 144 insertions, 144 deletions
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index d4661044234..4c2c0a8c362 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,5 +1,5 @@
-# $OpenBSD: files.vax,v 1.28 2004/10/08 13:04:36 grange Exp $
-# $NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
+# $OpenBSD: files.vax,v 1.29 2005/03/08 20:00:24 tdeval Exp $
+# $NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
#
# new style config file for vax architecture
#
@@ -9,97 +9,97 @@ maxpartitions 16
maxusers 2 8 64
-device mainbus { }
+device mainbus {}
attach mainbus at root
# Define a bunch of devices, needed in more than one place.
device cpu
device mem
-device mba { drive = -1 }
+device mba {drive = -1}
# SBI and related devices
-device sbi { tr=-1 }
+device sbi {tr = -1}
attach sbi at mainbus with sbi_mainbus
-file arch/vax/vax/sbi.c sbi
+file arch/vax/vax/sbi.c sbi
attach mem at sbi with mem_sbi
-file arch/vax/vax/ka780.c vax780 | mem_sbi
-file arch/vax/vax/cfl.c vax780 | mem_sbi
+file arch/vax/vax/ka780.c vax780 | mem_sbi
+file arch/vax/vax/cfl.c vax780 | mem_sbi
# Abus and related devices
-device abus { }
+device abus {}
attach abus at mainbus
attach sbi at abus with sbi_abus
-file arch/vax/vax/ka860.c abus
-file arch/vax/vax/crl.c abus
+file arch/vax/vax/ka860.c abus
+file arch/vax/vax/crl.c abus
# CMI and related devices
-device cmi { tr=-1 }
+device cmi {tr = -1}
attach cmi at mainbus
-file arch/vax/vax/cmi.c cmi
+file arch/vax/vax/cmi.c cmi
attach mem at cmi with mem_cmi
-file arch/vax/vax/ka750.c vax750 | mem_cmi
-file arch/vax/vax/ctu.c vax750 | mem_cmi
+file arch/vax/vax/ka750.c vax750 | mem_cmi
+file arch/vax/vax/ctu.c vax750 | mem_cmi
-device vsbus { csr }
+device vsbus {csr}
attach vsbus at mainbus
-file arch/vax/vsa/vsbus.c vsbus
+file arch/vax/vsa/vsbus.c vsbus
file arch/vax/vsa/vsbus_dma.c vsbus
# DEC SGEC Second Generation Ethernet Controller
-define sgec
-file arch/vax/if/sgec.c sgec
+define sgec
+file arch/vax/if/sgec.c sgec
-device ibus { }
+device ibus {}
attach ibus at mainbus
-file arch/vax/vax/ibus.c ibus
+file arch/vax/vax/ibus.c ibus
-device ze: sgec, ether, ifnet
+device ze: sgec, ether, ifnet
attach ze at ibus with ze_ibus
-file arch/vax/if/if_ze.c ze_ibus
+file arch/vax/if/if_ze.c ze_ibus
attach ze at vsbus with ze_vsbus
-file arch/vax/vsa/if_ze_vsbus.c ze_vsbus
+file arch/vax/vsa/if_ze_vsbus.c ze_vsbus
attach le at ibus with le_ibus
-file arch/vax/if/if_le.c le_ibus
+file arch/vax/if/if_le.c le_ibus
attach mba at sbi with mba_sbi
attach mba at cmi with mba_cmi
-file arch/vax/mba/mba.c mba needs-flag
+file arch/vax/mba/mba.c mba needs-flag
-device hp: disk
-attach hp at mba
-file arch/vax/mba/hp.c hp needs-flag
+device hp: disk
+attach hp at mba
+file arch/vax/mba/hp.c hp needs-flag
major {hp = 0}
device ht: tape
attach ht at mba
-file arch/vax/mba/ht.c ht needs-flag
+file arch/vax/mba/ht.c ht needs-flag
# Memory Disk for install floppy
-#file arch/vax/vax/md_root.c memory_disk_hooks
+#file arch/vax/vax/md_root.c memory_disk_hooks
#major {md = 23}
# MSCP device drivers
-include "arch/vax/mscp/files.mscp"
+include "arch/vax/mscp/files.mscp"
major {ra = 9}
# Unibus/Q22 bus definitions
-include "arch/vax/qbus/files.uba"
+include "arch/vax/qbus/files.uba"
attach uba at ibus with uba_ibus
-file arch/vax/uba/uba_ibus.c uba_ibus
+file arch/vax/uba/uba_ibus.c uba_ibus
attach uba at sbi with uba_sbi
-file arch/vax/uba/uba_sbi.c uba_sbi
+file arch/vax/uba/uba_sbi.c uba_sbi
attach uba at cmi with uba_cmi
-file arch/vax/uba/uba_cmi.c uba_cmi
+file arch/vax/uba/uba_cmi.c uba_cmi
# BI bus definitions
#include "arch/vax/bi/files.bi"
#attach bi at mainbus with bi_mainbus
-#file arch/vax/bi/bi_mainbus.c bi_mainbus
+#file arch/vax/bi/bi_mainbus.c bi_mainbus
# VAX CPUs at BI, do not belong in MI code.
#attach cpu at bi with cpu_bi
@@ -108,15 +108,15 @@ file arch/vax/uba/uba_cmi.c uba_cmi
# TS11 at UBA
device ts: tape
attach ts at uba
-file arch/vax/uba/ts.c ts needs-flag
+file arch/vax/uba/ts.c ts needs-flag
attach dz at vsbus with dz_vsbus
-file arch/vax/vsa/dz_ibus.c dz_vsbus
+file arch/vax/vsa/dz_ibus.c dz_vsbus
# RD-type disks at VS2000's onboard MFM-controller
-device hdc { drive = -1 }
+device hdc {drive = -1}
attach hdc at vsbus
-file arch/vax/vsa/hdc9224.c hdc | ry | hd needs-flag
+file arch/vax/vsa/hdc9224.c hdc | ry | hd needs-flag
device hd: disk
attach hd at hdc
@@ -129,10 +129,10 @@ major {ry = 24}
#
# Bus-independent support for DEC devices
#
-include "arch/vax/dec/files.dec"
+include "arch/vax/dec/files.dec"
# wscons files.
-include "dev/wscons/files.wscons"
+include "dev/wscons/files.wscons"
# RAM Disk for install floppy
major {rd = 23}
@@ -141,36 +141,36 @@ major {rd = 23}
# Machine-independent SCSI driver.
#
-include "../../../scsi/files.scsi"
-major { sd = 20 }
-major { st = 21 }
-major { cd = 22 }
+include "../../../scsi/files.scsi"
+major {sd = 20}
+major {st = 21}
+major {cd = 22}
# builtin NCR5380 SCSI-controller on VAXstation
device ncr: scsi, ncr5380sbc
attach ncr at vsbus
-file arch/vax/vsa/ncr.c ncr needs-flag
+file arch/vax/vsa/ncr.c ncr needs-flag
# LANCE ethernet controller on VAXstation
attach le at vsbus with le_vsbus
-file arch/vax/vsa/if_le_vsbus.c le_vsbus
+file arch/vax/vsa/if_le_vsbus.c le_vsbus
# Monochrome framebuffer on VS3100.
device smg: wsemuldisplaydev
attach smg at vsbus
-file arch/vax/vsa/smg.c smg needs-flag
+file arch/vax/vsa/smg.c smg needs-flag
device lkkbd: wskbddev
attach lkkbd at dz with dzkbd
-file arch/vax/dec/dzkbd.c dzkbd needs-flag
+file arch/vax/dec/dzkbd.c dzkbd needs-flag
device lkms: wsmousedev
attach lkms at dz with dzms
-file arch/vax/dec/dzms.c dzms needs-flag
+file arch/vax/dec/dzms.c dzms needs-flag
#device lkc: qfont
#attach lkc at dz
-#file arch/vax/vsa/lkc.c lkc needs-flag
+#file arch/vax/vsa/lkc.c lkc needs-flag
# These devices aren't tested (or even compiled!)
# They are just included here to make some files happy ;)
@@ -179,133 +179,133 @@ file arch/vax/dec/dzms.c dzms needs-flag
# Ikonas framebuffer
device ik
attach ik at uba
-file arch/vax/uba/ik.c ik needs-flag
+file arch/vax/uba/ik.c ik needs-flag
device vs
attach vs at uba
-file arch/vax/uba/vs.c vs needs-flag
+file arch/vax/uba/vs.c vs needs-flag
# RK06/07 on UBA
device rk: disk
attach rk at uba
-file arch/vax/uba/rk.c rk needs-flag
+file arch/vax/uba/rk.c rk needs-flag
# TM11/TE10 at UBA
device te: tape
attach te at uba
-file arch/vax/uba/tm.c te needs-flag
+file arch/vax/uba/tm.c te needs-flag
# TU78 at MBA
device mu: tape
attach mu at mba
-file arch/vax/mba/mt.c mu needs-flag
+file arch/vax/mba/mt.c mu needs-flag
# DMF32 on UBA
device dmf # XXX?
attach dmf at uba
-file arch/vax/uba/dmf.c dmf needs-flag
-file arch/vax/uba/dmz.c dmf needs-flag
+file arch/vax/uba/dmf.c dmf needs-flag
+file arch/vax/uba/dmz.c dmf needs-flag
# DMZ32 on UBA
device dmz # XXX?
attach dmz at uba
-file arch/vax/uba/dmx.c dmz needs-flag
+file arch/vax/uba/dmx.c dmz needs-flag
# DN-11 on UBA
device dn # XXX?
attach dn at uba
-file arch/vax/uba/dn.c dn needs-flag
+file arch/vax/uba/dn.c dn needs-flag
# IDC (RB730) on UBA (VAX 11/730)
-device idc { drive=-1 }
+device idc {drive = -1}
attach idc at uba
device rb: disk
attach rb at idc
-file arch/vax/uba/idc.c rb needs-flag
+file arch/vax/uba/idc.c rb needs-flag
# LP-11 at UBA
device lp
attach lp at uba
-file arch/vax/uba/lp.c lp needs-flag
+file arch/vax/uba/lp.c lp needs-flag
# ???? at UBA
device lpa
attach lpa at uba
-file arch/vax/uba/lpa.c lpa needs-flag
+file arch/vax/uba/lpa.c lpa needs-flag
# PS2 at UBA
device ps
attach ps at uba
-file arch/vax/uba/ps.c ps needs-flag
+file arch/vax/uba/ps.c ps needs-flag
# RL02/RL11 at UBA
-#device hl { drive=-1 }
+#device hl {drive = -1}
#attach hl at uba
#device rl: disk
#attach rl at hl
-#file arch/vax/uba/rl.c rl needs-flag
+#file arch/vax/uba/rl.c rl needs-flag
# SC-21/SC-31 at UBA
-device sc { drive=-1 }
+device sc {drive = -1}
attach sc at uba
device up: disk
attach up at sc
-file arch/vax/uba/up.c up needs-flag
+file arch/vax/uba/up.c up needs-flag
# TU45 at UBA
-device ut { drive=-1}
+device ut {drive = -1}
attach ut at uba
device tj: tape
attach tj at ut
-file arch/vax/uba/ut.c tj needs-flag
+file arch/vax/uba/ut.c tj needs-flag
# TU58/DECtape II
device uu: tape
attach uu at uba
-file arch/vax/uba/uu.c uu needs-flag
+file arch/vax/uba/uu.c uu needs-flag
# Benson-Varian plotter at UBA
-device va { drive=-1}
+device va {drive = -1}
attach va at uba
device vz
attach vz at va
-file arch/vax/uba/va.c va needs-flag
+file arch/vax/uba/va.c va needs-flag
# Versatec plotter at UBA
device vp
attach vp at uba
-file arch/vax/uba/vp.c vp needs-flag
+file arch/vax/uba/vp.c vp needs-flag
# QVSS at UBA
device qv
attach qv at uba
-file arch/vax/uba/qv.c qv needs-flag
+file arch/vax/uba/qv.c qv needs-flag
# Interlan NP100 at UBA
device np: ifnet
attach np at uba
-file arch/vax/if/if_ix.c np needs-flag
-file arch/vax/uba/np.c np needs-flag
+file arch/vax/if/if_ix.c np needs-flag
+file arch/vax/uba/np.c np needs-flag
# ACC LH/DH IMP on UBA
device acc: ifnet
attach acc at uba
-file arch/vax/if/if_acc.c acc needs-flag
+file arch/vax/if/if_acc.c acc needs-flag
# DR11C at UBA
device ct # XXX
attach ct at uba
-file arch/vax/uba/ct.c ct needs-flag
+file arch/vax/uba/ct.c ct needs-flag
# A/D-converter on UBA
device ad
attach ad at uba
-file arch/vax/uba/ad.c ad needs-flag
+file arch/vax/uba/ad.c ad needs-flag
# DH-11/DM-11 on UBA
device dh # XXX?
attach dh at uba
-file arch/vax/uba/dh.c dh needs-flag
+file arch/vax/uba/dh.c dh needs-flag
# These are general files needed for compilation.
file dev/cninit.c
@@ -316,21 +316,21 @@ file arch/vax/vax/clock.c
file arch/vax/vax/gencons.c vax8600|vax8200|vax780|vax750|vax630|vax650|vax660|vax670|vax680
file arch/vax/vax/pmap.c
file arch/vax/vax/machdep.c
-file arch/vax/vax/ka820.c vax8200
-file arch/vax/vax/crx.c vax8200
-file arch/vax/vax/ka630.c vax630
-file arch/vax/vax/ka410.c vax410
-file arch/vax/vax/ka43.c vax43
-file arch/vax/vax/ka46.c vax46
-file arch/vax/vax/ka48.c vax48
-file arch/vax/vax/ka49.c vax49
-file arch/vax/vax/ka53.c vax53
-file arch/vax/vax/emulate.s insn_emulate
-file arch/vax/vax/unimpl_emul.s insn_emulate
-file arch/vax/vax/ka650.c vax650
-file arch/vax/vax/ka660.c vax660
-file arch/vax/vax/ka670.c vax670
-file arch/vax/vax/ka680.c vax680
+file arch/vax/vax/ka820.c vax8200
+file arch/vax/vax/crx.c vax8200
+file arch/vax/vax/ka630.c vax630
+file arch/vax/vax/ka410.c vax410
+file arch/vax/vax/ka43.c vax43
+file arch/vax/vax/ka46.c vax46
+file arch/vax/vax/ka48.c vax48
+file arch/vax/vax/ka49.c vax49
+file arch/vax/vax/ka53.c vax53
+file arch/vax/vax/emulate.s insn_emulate
+file arch/vax/vax/unimpl_emul.s insn_emulate
+file arch/vax/vax/ka650.c vax650
+file arch/vax/vax/ka660.c vax660
+file arch/vax/vax/ka670.c vax670
+file arch/vax/vax/ka680.c vax680
file arch/vax/vax/scb.c
file arch/vax/vax/conf.c
file arch/vax/vax/urem.s
@@ -341,42 +341,42 @@ file arch/vax/vax/bus_mem.c
file arch/vax/vax/sgmap.c
file arch/vax/vax/vm_machdep.c
file arch/vax/vax/findcpu.c
-file arch/vax/vax/random.s
+file arch/vax/vax/random.s
file arch/vax/vax/rootfil.c
file arch/vax/vax/autoconf.c
-file arch/vax/vax/in_cksum.c inet
-file arch/vax/vax/ns_cksum.c ns
-file arch/vax/vax/disksubr.c disk | tape
-file arch/vax/vax/db_machdep.c ddb
-file arch/vax/vax/db_disasm.c ddb
+file arch/vax/vax/in_cksum.c inet
+file arch/vax/vax/ns_cksum.c ns
+file arch/vax/vax/disksubr.c disk | tape
+file arch/vax/vax/db_machdep.c ddb
+file arch/vax/vax/db_disasm.c ddb
file arch/vax/vax/opcodes.c
-file arch/vax/uba/uba_dma.c uba
+file arch/vax/uba/uba_dma.c uba
# builtin NCR53C95 SCSI Controller on VAXstation 4000 VLC/60/9x
-device asc: scsi, ncr53c9x
-attach asc at vsbus with asc_vsbus
-file arch/vax/vsa/asc_vsbus.c asc needs-flag
+device asc: scsi, ncr53c9x
+attach asc at vsbus with asc_vsbus
+file arch/vax/vsa/asc_vsbus.c asc needs-flag
-include "compat/ultrix/files.ultrix"
-include "compat/vax1k/files.vax1k"
+include "compat/ultrix/files.ultrix"
+include "compat/vax1k/files.vax1k"
# Dom h{ra f}r vara kvar s} l{nge f}r vi se vilka vi beh|ver...
-#arch/vax/vax/dkbad.c standard
-#arch/vax/vax/ka730.c standard
-#arch/vax/vax/iidr.o optional ii
-#arch/vax/vax/iidrsys.o optional ii
-#arch/vax/vax/iidr_glob.o optional ii
-#arch/vax/if/if_css.c optional css imp device-driver
-#arch/vax/if/if_dp.c optional dp device-driver
-#arch/vax/if/if_ddn.c optional ddn device-driver
-#arch/vax/if/if_dmc.c optional dmc device-driver
-#arch/vax/if/if_dmv.c optional dmv device-driver
-#arch/vax/if/if_ec.c optional ec device-driver
-#arch/vax/if/if_en.c optional en device-driver
-#arch/vax/if/if_ex.c optional ex device-driver
-#arch/vax/if/if_hdh.c optional hdh device-driver
-#arch/vax/if/if_hy.c optional hy device-driver
-#arch/vax/if/if_il.c optional il device-driver
-#arch/vax/if/if_pcl.c optional pcl device-driver
-#arch/vax/if/if_vv.c optional vv device-driver
-#arch/vax/if/raw_hy.c optional hy device-driver
+#arch/vax/vax/dkbad.c standard
+#arch/vax/vax/ka730.c standard
+#arch/vax/vax/iidr.o optional ii
+#arch/vax/vax/iidrsys.o optional ii
+#arch/vax/vax/iidr_glob.o optional ii
+#arch/vax/if/if_css.c optional css imp device-driver
+#arch/vax/if/if_dp.c optional dp device-driver
+#arch/vax/if/if_ddn.c optional ddn device-driver
+#arch/vax/if/if_dmc.c optional dmc device-driver
+#arch/vax/if/if_dmv.c optional dmv device-driver
+#arch/vax/if/if_ec.c optional ec device-driver
+#arch/vax/if/if_en.c optional en device-driver
+#arch/vax/if/if_ex.c optional ex device-driver
+#arch/vax/if/if_hdh.c optional hdh device-driver
+#arch/vax/if/if_hy.c optional hy device-driver
+#arch/vax/if/if_il.c optional il device-driver
+#arch/vax/if/if_pcl.c optional pcl device-driver
+#arch/vax/if/if_vv.c optional vv device-driver
+#arch/vax/if/raw_hy.c optional hy device-driver
diff --git a/sys/arch/vax/dec/files.dec b/sys/arch/vax/dec/files.dec
index 921a5580518..829b7ee4c0d 100644
--- a/sys/arch/vax/dec/files.dec
+++ b/sys/arch/vax/dec/files.dec
@@ -1,7 +1,7 @@
-# $OpenBSD: files.dec,v 1.1 2001/05/16 22:15:17 hugh Exp $
-# $NetBSD: files.dec,v 1.4 1999/08/04 07:17:51 nisimura Exp $
+# $OpenBSD: files.dec,v 1.2 2005/03/08 20:00:24 tdeval Exp $
+# $NetBSD: files.dec,v 1.4 1999/08/04 07:17:51 nisimura Exp $
#
-# Config file and device description for machine-independent
+# Config file and device description for machine-independent
# code for devices for Digital Equipment Corp. systems.
# Included by ports that need it.
@@ -9,9 +9,9 @@
# which need it should specify the le_de_subr attribute.
define le_dec_subr
-# DMA copy functions. Lance attachments qhich Decices
+# DMA copy functions.
file arch/vax/dec/if_le_dec.c le_dec_subr
-# LK201 keyboard
-file arch/vax/dec/lk201_ws.c lkkbd
-file arch/vax/dec/wskbdmap_lk201.c lkkbd
+# LK201 keyboard
+file arch/vax/dec/lk201_ws.c lkkbd
+file arch/vax/dec/wskbdmap_lk201.c lkkbd
diff --git a/sys/arch/vax/qbus/files.uba b/sys/arch/vax/qbus/files.uba
index 673fce57059..38a6a77029d 100644
--- a/sys/arch/vax/qbus/files.uba
+++ b/sys/arch/vax/qbus/files.uba
@@ -1,20 +1,20 @@
-# $OpenBSD: files.uba,v 1.2 2001/05/16 22:15:18 hugh Exp $
+# $OpenBSD: files.uba,v 1.3 2005/03/08 20:00:24 tdeval Exp $
# $NetBSD: files.uba,v 1.6 1999/06/20 18:09:22 ragge Exp $
#
# Config file and device description for machine-independent
# code for devices Digital Equipment Corp. Unibus and Q22 bus.
# Included by ports that need it.
-device uba { csr }
+device uba {csr}
define qfont
file arch/vax/qbus/uba.c uba
# DZ-11 (-compatible) tty device driver.
-device dz { line = -1 }: tty
+device dz {line = -1}: tty
attach dz at uba with dz_uba
file arch/vax/qbus/dz.c dz needs-flag
-file arch/vax/qbus/dz_uba.c dz_uba
+file arch/vax/qbus/dz_uba.c dz_uba
# DL-11 at UBA
device dl: tty
@@ -36,12 +36,12 @@ file arch/vax/qbus/uda.c uda | mtc
# DEQNA/DELQA Ethernet controller
device qe: ifnet, ether
attach qe at uba
-file arch/vax/if/if_qe.c qe
+file arch/vax/if/if_qe.c qe
# DEUNA/DELUA Ethernet controller
device de: ifnet, ether
attach de at uba
-file arch/vax/if/if_de.c de
+file arch/vax/if/if_de.c de
# QDSS at UBA
device qd: qfont
@@ -49,4 +49,4 @@ attach qd at uba
file arch/vax/qbus/qd.c qd needs-count
# Fontfile for DEC framebuffers, soon to die in favour for MI fontfiles.
-file arch/vax/qbus/qfont.c qfont
+file arch/vax/qbus/qfont.c qfont