From 1de4f40a8a001437d552eb883b030c4833e258af Mon Sep 17 00:00:00 2001 From: bjh21 Date: Sun, 24 Mar 2002 15:45:29 +0000 Subject: [PATCH] Rename NetBSD/arm26 to NetBSD/acorn26, so that the two Acorn/ARM ports have matching names. This commit might include some private hacks that have been lurking in my tree a while. They're all harmless, and this reduces the number of gratuitous diffs I have to deal with. --- sys/arch/acorn26/Makefile | 33 +++ .../{arm26/arm26 => acorn26/acorn26}/Locore.c | 4 +- .../arm26 => acorn26/acorn26}/autoconf.c | 6 +- .../{arm26/arm26 => acorn26/acorn26}/bus.c | 4 +- .../{arm26/arm26 => acorn26/acorn26}/conf.c | 4 +- .../arm26 => acorn26/acorn26}/cons_machdep.c | 4 +- .../arm26 => acorn26/acorn26}/copyinout.S | 4 +- sys/arch/acorn26/acorn26/copyinoutstr.S | 232 ++++++++++++++++++ .../{arm26/arm26 => acorn26/acorn26}/cpu.c | 8 +- .../{arm26/arm26 => acorn26/acorn26}/cpuvar.h | 2 +- .../arm26 => acorn26/acorn26}/db_interface.c | 4 +- .../arm26 => acorn26/acorn26}/db_machdep.c | 2 +- .../{arm26/arm26 => acorn26/acorn26}/except.c | 4 +- .../{arm26/arm26 => acorn26/acorn26}/fpu.c | 6 +- .../arm26 => acorn26/acorn26}/fpu_asm.S | 4 +- .../{arm26/arm26 => acorn26/acorn26}/fpuvar.h | 2 +- .../arm26 => acorn26/acorn26}/genassym.cf | 4 +- .../{arm26/arm26 => acorn26/acorn26}/irq.c | 14 +- .../{arm26/arm26 => acorn26/acorn26}/locore.S | 4 +- .../arm26 => acorn26/acorn26}/machdep.c | 4 +- .../{arm26/arm26 => acorn26/acorn26}/mem.c | 16 +- .../{arm26/arm26 => acorn26/acorn26}/pmap.c | 8 +- .../{arm26/arm26 => acorn26/acorn26}/rscons.c | 2 +- .../arm26 => acorn26/acorn26}/softintr.c | 4 +- .../{arm26/arm26 => acorn26/acorn26}/start.c | 6 +- .../{arm26/arm26 => acorn26/acorn26}/stubs.c | 4 +- .../arm26 => acorn26/acorn26}/sys_machdep.c | 4 +- .../arm26 => acorn26/acorn26}/vm_machdep.c | 4 +- sys/arch/{arm26 => acorn26}/compile/.keep_me | 0 sys/arch/{arm26 => acorn26}/conf/FOURMEG | 2 +- sys/arch/{arm26 => acorn26}/conf/GENERIC | 6 +- .../conf/Makefile.acorn26} | 18 +- .../conf/files.acorn26} | 99 ++++---- sys/arch/acorn26/conf/std.acorn26 | 6 + sys/arch/{arm26 => acorn26}/include/Makefile | 6 +- sys/arch/acorn26/include/ansi.h | 3 + sys/arch/acorn26/include/aout_machdep.h | 3 + sys/arch/acorn26/include/asm.h | 3 + sys/arch/{arm26 => acorn26}/include/boot.h | 2 +- sys/arch/acorn26/include/bootconfig.h | 3 + sys/arch/acorn26/include/bswap.h | 3 + sys/arch/{arm26 => acorn26}/include/bus.h | 10 +- sys/arch/acorn26/include/cdefs.h | 3 + sys/arch/acorn26/include/cpu.h | 3 + .../{arm26 => acorn26}/include/db_machdep.h | 4 +- sys/arch/acorn26/include/disklabel.h | 3 + sys/arch/acorn26/include/elf_machdep.h | 3 + sys/arch/acorn26/include/endian.h | 3 + sys/arch/acorn26/include/endian_machdep.h | 3 + sys/arch/{arm26 => acorn26}/include/fiq.h | 8 +- sys/arch/acorn26/include/float.h | 3 + sys/arch/acorn26/include/fp.h | 3 + sys/arch/{arm26 => acorn26}/include/fpureg.h | 2 +- sys/arch/{arm26 => acorn26}/include/frame.h | 2 +- sys/arch/acorn26/include/ieee.h | 3 + sys/arch/acorn26/include/ieeefp.h | 3 + sys/arch/acorn26/include/int_const.h | 3 + sys/arch/acorn26/include/int_fmtio.h | 3 + sys/arch/acorn26/include/int_limits.h | 3 + sys/arch/acorn26/include/int_mwgwtypes.h | 3 + sys/arch/acorn26/include/int_types.h | 3 + sys/arch/{arm26 => acorn26}/include/intr.h | 7 +- sys/arch/{arm26 => acorn26}/include/ipkdb.h | 2 +- sys/arch/{arm26 => acorn26}/include/irq.h | 4 +- sys/arch/acorn26/include/limits.h | 3 + .../include/loadfile_machdep.h | 2 +- sys/arch/acorn26/include/lock.h | 3 + sys/arch/{arm26 => acorn26}/include/machdep.h | 2 +- sys/arch/acorn26/include/math.h | 3 + sys/arch/{arm26 => acorn26}/include/memcreg.h | 2 +- sys/arch/{arm26 => acorn26}/include/param.h | 6 +- sys/arch/acorn26/include/pcb.h | 3 + sys/arch/{arm26 => acorn26}/include/pmap.h | 2 +- .../include/podulebus_machdep.h | 2 +- sys/arch/{arm26 => acorn26}/include/proc.h | 2 +- sys/arch/acorn26/include/profile.h | 3 + sys/arch/acorn26/include/ptrace.h | 3 + sys/arch/acorn26/include/reg.h | 3 + sys/arch/acorn26/include/setjmp.h | 3 + sys/arch/acorn26/include/signal.h | 3 + .../{arm26 => acorn26}/include/softintr.h | 2 +- sys/arch/acorn26/include/stdarg.h | 3 + sys/arch/acorn26/include/sysarch.h | 4 + sys/arch/acorn26/include/trap.h | 3 + sys/arch/acorn26/include/types.h | 10 + sys/arch/acorn26/include/varargs.h | 3 + sys/arch/{arm26 => acorn26}/include/vmparam.h | 2 +- sys/arch/{arm26 => acorn26}/iobus/iobus.c | 6 +- sys/arch/{arm26 => acorn26}/iobus/iobusvar.h | 2 +- sys/arch/{arm26 => acorn26}/iobus/ioc.c | 60 +---- sys/arch/{arm26 => acorn26}/iobus/iocreg.h | 2 +- sys/arch/{arm26 => acorn26}/iobus/iocvar.h | 52 +++- sys/arch/{arm26 => acorn26}/iobus/upc_iobus.c | 10 +- sys/arch/{arm26 => acorn26}/ioc/arckbd.c | 12 +- sys/arch/{arm26 => acorn26}/ioc/arckbdmap.c | 8 +- sys/arch/{arm26 => acorn26}/ioc/arckbdreg.h | 2 +- sys/arch/{arm26 => acorn26}/ioc/arckbdvar.h | 2 +- sys/arch/{arm26 => acorn26}/ioc/arcpp.c | 32 +-- sys/arch/{arm26 => acorn26}/ioc/arcppreg.h | 2 +- sys/arch/{arm26 => acorn26}/ioc/if_eca.c | 8 +- sys/arch/{arm26 => acorn26}/ioc/if_eca_fiq.S | 4 +- sys/arch/{arm26 => acorn26}/ioc/if_ecavar.h | 2 +- sys/arch/{arm26 => acorn26}/ioc/iic.c | 10 +- sys/arch/{arm26 => acorn26}/ioc/iic.h | 2 +- .../{arm26 => acorn26}/ioc/ioc_fiq_util.S | 6 +- sys/arch/{arm26 => acorn26}/ioc/ioeb.c | 10 +- sys/arch/{arm26 => acorn26}/ioc/ioebreg.h | 2 +- sys/arch/{arm26 => acorn26}/ioc/ioebvar.h | 2 +- sys/arch/{arm26 => acorn26}/ioc/latches.c | 12 +- sys/arch/{arm26 => acorn26}/ioc/latchreg.h | 2 +- sys/arch/{arm26 => acorn26}/ioc/latchvar.h | 2 +- sys/arch/{arm26 => acorn26}/ioc/pcf8583reg.h | 2 +- sys/arch/{arm26 => acorn26}/ioc/rtc.c | 8 +- sys/arch/acorn26/ioc/ssn.c | 184 ++++++++++++++ sys/arch/{arm26 => acorn26}/podulebus/if_eh.c | 6 +- .../{arm26 => acorn26}/podulebus/if_ehreg.h | 2 +- .../podulebus/podloader_asm.S | 4 +- .../{arm26 => acorn26}/podulebus/podulebus.c | 12 +- .../podulebus/podulebusreg.h | 2 +- sys/arch/acorn26/podulebus/powerrom.c | 37 +++ .../{arm26 => acorn26}/podulebus/unixbp.c | 10 +- .../{arm26 => acorn26}/podulebus/unixbpreg.h | 2 +- .../{arm26 => acorn26}/podulebus/unixbpvar.h | 2 +- sys/arch/acorn26/stand/Makefile | 5 + .../stand/Makefile.buildboot | 4 +- .../{arm26 => acorn26}/stand/boot26/Makefile | 2 +- .../{arm26 => acorn26}/stand/boot26/boot26.c | 2 +- .../stand/boot26/rmheader.S | 2 +- .../{arm26 => acorn26}/stand/boot26/start.S | 2 +- .../{arm26 => acorn26}/stand/boot26/version | 2 +- .../{arm26 => acorn26}/stand/lib/Makefile | 2 +- .../{arm26 => acorn26}/stand/lib/Makefile.inc | 4 +- .../{arm26 => acorn26}/stand/lib/devopen.c | 2 +- .../stand/lib/newvers_rm.sh | 2 +- .../stand/lib/riscoscalls.S | 14 +- .../stand/lib/riscoscalls.h | 30 ++- .../{arm26 => acorn26}/stand/lib/riscoscons.c | 2 +- sys/arch/acorn26/stand/lib/riscosdisk.c | 69 ++++++ sys/arch/acorn26/stand/lib/riscosdisk.h | 33 +++ .../stand/lib/riscoserrors.c | 2 +- .../{arm26 => acorn26}/stand/lib/riscosfile.c | 2 +- .../{arm26 => acorn26}/stand/lib/riscosfile.h | 2 +- sys/arch/{arm26 => acorn26}/stand/lib/srt0.S | 2 +- sys/arch/{arm26 => acorn26}/stand/lib/srt1.c | 2 +- sys/arch/{arm26 => acorn26}/vidc/arcvideo.c | 12 +- .../{arm26 => acorn26}/vidc/arcvideovar.h | 2 +- sys/arch/{arm26 => acorn26}/vidc/vidcreg.h | 2 +- sys/arch/{arm26 => acorn26}/vidc/vidmodes.c | 0 sys/arch/arm26/Makefile | 33 --- sys/arch/arm26/conf/std.arm26 | 6 - sys/arch/arm26/include/ansi.h | 3 - sys/arch/arm26/include/aout_machdep.h | 3 - sys/arch/arm26/include/asm.h | 3 - sys/arch/arm26/include/bootconfig.h | 3 - sys/arch/arm26/include/bswap.h | 3 - sys/arch/arm26/include/cdefs.h | 3 - sys/arch/arm26/include/cpu.h | 3 - sys/arch/arm26/include/disklabel.h | 3 - sys/arch/arm26/include/elf_machdep.h | 3 - sys/arch/arm26/include/endian.h | 3 - sys/arch/arm26/include/endian_machdep.h | 3 - sys/arch/arm26/include/float.h | 3 - sys/arch/arm26/include/fp.h | 3 - sys/arch/arm26/include/ieee.h | 3 - sys/arch/arm26/include/ieeefp.h | 3 - sys/arch/arm26/include/int_const.h | 3 - sys/arch/arm26/include/int_fmtio.h | 3 - sys/arch/arm26/include/int_limits.h | 3 - sys/arch/arm26/include/int_mwgwtypes.h | 3 - sys/arch/arm26/include/int_types.h | 3 - sys/arch/arm26/include/limits.h | 3 - sys/arch/arm26/include/lock.h | 3 - sys/arch/arm26/include/math.h | 3 - sys/arch/arm26/include/pcb.h | 3 - sys/arch/arm26/include/profile.h | 3 - sys/arch/arm26/include/ptrace.h | 3 - sys/arch/arm26/include/reg.h | 3 - sys/arch/arm26/include/setjmp.h | 3 - sys/arch/arm26/include/signal.h | 3 - sys/arch/arm26/include/stdarg.h | 3 - sys/arch/arm26/include/sysarch.h | 4 - sys/arch/arm26/include/trap.h | 3 - sys/arch/arm26/include/types.h | 10 - sys/arch/arm26/include/varargs.h | 3 - sys/arch/arm26/stand/Makefile | 5 - 185 files changed, 1086 insertions(+), 501 deletions(-) create mode 100644 sys/arch/acorn26/Makefile rename sys/arch/{arm26/arm26 => acorn26/acorn26}/Locore.c (97%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/autoconf.c (93%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/bus.c (97%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/conf.c (98%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/cons_machdep.c (94%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/copyinout.S (98%) create mode 100644 sys/arch/acorn26/acorn26/copyinoutstr.S rename sys/arch/{arm26/arm26 => acorn26/acorn26}/cpu.c (97%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/cpuvar.h (96%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/db_interface.c (99%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/db_machdep.c (98%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/except.c (98%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/fpu.c (95%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/fpu_asm.S (96%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/fpuvar.h (97%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/genassym.cf (96%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/irq.c (96%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/locore.S (99%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/machdep.c (98%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/mem.c (95%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/pmap.c (99%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/rscons.c (97%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/softintr.c (96%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/start.c (97%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/stubs.c (89%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/sys_machdep.c (94%) rename sys/arch/{arm26/arm26 => acorn26/acorn26}/vm_machdep.c (98%) rename sys/arch/{arm26 => acorn26}/compile/.keep_me (100%) rename sys/arch/{arm26 => acorn26}/conf/FOURMEG (99%) rename sys/arch/{arm26 => acorn26}/conf/GENERIC (98%) rename sys/arch/{arm26/conf/Makefile.arm26 => acorn26/conf/Makefile.acorn26} (78%) rename sys/arch/{arm26/conf/files.arm26 => acorn26/conf/files.acorn26} (69%) create mode 100644 sys/arch/acorn26/conf/std.acorn26 rename sys/arch/{arm26 => acorn26}/include/Makefile (79%) create mode 100644 sys/arch/acorn26/include/ansi.h create mode 100644 sys/arch/acorn26/include/aout_machdep.h create mode 100644 sys/arch/acorn26/include/asm.h rename sys/arch/{arm26 => acorn26}/include/boot.h (98%) create mode 100644 sys/arch/acorn26/include/bootconfig.h create mode 100644 sys/arch/acorn26/include/bswap.h rename sys/arch/{arm26 => acorn26}/include/bus.h (96%) create mode 100644 sys/arch/acorn26/include/cdefs.h create mode 100644 sys/arch/acorn26/include/cpu.h rename sys/arch/{arm26 => acorn26}/include/db_machdep.h (80%) create mode 100644 sys/arch/acorn26/include/disklabel.h create mode 100644 sys/arch/acorn26/include/elf_machdep.h create mode 100644 sys/arch/acorn26/include/endian.h create mode 100644 sys/arch/acorn26/include/endian_machdep.h rename sys/arch/{arm26 => acorn26}/include/fiq.h (93%) create mode 100644 sys/arch/acorn26/include/float.h create mode 100644 sys/arch/acorn26/include/fp.h rename sys/arch/{arm26 => acorn26}/include/fpureg.h (97%) rename sys/arch/{arm26 => acorn26}/include/frame.h (98%) create mode 100644 sys/arch/acorn26/include/ieee.h create mode 100644 sys/arch/acorn26/include/ieeefp.h create mode 100644 sys/arch/acorn26/include/int_const.h create mode 100644 sys/arch/acorn26/include/int_fmtio.h create mode 100644 sys/arch/acorn26/include/int_limits.h create mode 100644 sys/arch/acorn26/include/int_mwgwtypes.h create mode 100644 sys/arch/acorn26/include/int_types.h rename sys/arch/{arm26 => acorn26}/include/intr.h (95%) rename sys/arch/{arm26 => acorn26}/include/ipkdb.h (96%) rename sys/arch/{arm26 => acorn26}/include/irq.h (97%) create mode 100644 sys/arch/acorn26/include/limits.h rename sys/arch/{arm26 => acorn26}/include/loadfile_machdep.h (98%) create mode 100644 sys/arch/acorn26/include/lock.h rename sys/arch/{arm26 => acorn26}/include/machdep.h (97%) create mode 100644 sys/arch/acorn26/include/math.h rename sys/arch/{arm26 => acorn26}/include/memcreg.h (99%) rename sys/arch/{arm26 => acorn26}/include/param.h (96%) create mode 100644 sys/arch/acorn26/include/pcb.h rename sys/arch/{arm26 => acorn26}/include/pmap.h (97%) rename sys/arch/{arm26 => acorn26}/include/podulebus_machdep.h (98%) rename sys/arch/{arm26 => acorn26}/include/proc.h (96%) create mode 100644 sys/arch/acorn26/include/profile.h create mode 100644 sys/arch/acorn26/include/ptrace.h create mode 100644 sys/arch/acorn26/include/reg.h create mode 100644 sys/arch/acorn26/include/setjmp.h create mode 100644 sys/arch/acorn26/include/signal.h rename sys/arch/{arm26 => acorn26}/include/softintr.h (96%) create mode 100644 sys/arch/acorn26/include/stdarg.h create mode 100644 sys/arch/acorn26/include/sysarch.h create mode 100644 sys/arch/acorn26/include/trap.h create mode 100644 sys/arch/acorn26/include/types.h create mode 100644 sys/arch/acorn26/include/varargs.h rename sys/arch/{arm26 => acorn26}/include/vmparam.h (98%) rename sys/arch/{arm26 => acorn26}/iobus/iobus.c (95%) rename sys/arch/{arm26 => acorn26}/iobus/iobusvar.h (96%) rename sys/arch/{arm26 => acorn26}/iobus/ioc.c (90%) rename sys/arch/{arm26 => acorn26}/iobus/iocreg.h (99%) rename sys/arch/{arm26 => acorn26}/iobus/iocvar.h (68%) rename sys/arch/{arm26 => acorn26}/iobus/upc_iobus.c (94%) rename sys/arch/{arm26 => acorn26}/ioc/arckbd.c (98%) rename sys/arch/{arm26 => acorn26}/ioc/arckbdmap.c (97%) rename sys/arch/{arm26 => acorn26}/ioc/arckbdreg.h (98%) rename sys/arch/{arm26 => acorn26}/ioc/arckbdvar.h (96%) rename sys/arch/{arm26 => acorn26}/ioc/arcpp.c (94%) rename sys/arch/{arm26 => acorn26}/ioc/arcppreg.h (73%) rename sys/arch/{arm26 => acorn26}/ioc/if_eca.c (98%) rename sys/arch/{arm26 => acorn26}/ioc/if_eca_fiq.S (97%) rename sys/arch/{arm26 => acorn26}/ioc/if_ecavar.h (97%) rename sys/arch/{arm26 => acorn26}/ioc/iic.c (97%) rename sys/arch/{arm26 => acorn26}/ioc/iic.h (97%) rename sys/arch/{arm26 => acorn26}/ioc/ioc_fiq_util.S (91%) rename sys/arch/{arm26 => acorn26}/ioc/ioeb.c (92%) rename sys/arch/{arm26 => acorn26}/ioc/ioebreg.h (94%) rename sys/arch/{arm26 => acorn26}/ioc/ioebvar.h (96%) rename sys/arch/{arm26 => acorn26}/ioc/latches.c (92%) rename sys/arch/{arm26 => acorn26}/ioc/latchreg.h (97%) rename sys/arch/{arm26 => acorn26}/ioc/latchvar.h (96%) rename sys/arch/{arm26 => acorn26}/ioc/pcf8583reg.h (97%) rename sys/arch/{arm26 => acorn26}/ioc/rtc.c (97%) create mode 100644 sys/arch/acorn26/ioc/ssn.c rename sys/arch/{arm26 => acorn26}/podulebus/if_eh.c (99%) rename sys/arch/{arm26 => acorn26}/podulebus/if_ehreg.h (96%) rename sys/arch/{arm26 => acorn26}/podulebus/podloader_asm.S (94%) rename sys/arch/{arm26 => acorn26}/podulebus/podulebus.c (97%) rename sys/arch/{arm26 => acorn26}/podulebus/podulebusreg.h (95%) create mode 100644 sys/arch/acorn26/podulebus/powerrom.c rename sys/arch/{arm26 => acorn26}/podulebus/unixbp.c (92%) rename sys/arch/{arm26 => acorn26}/podulebus/unixbpreg.h (77%) rename sys/arch/{arm26 => acorn26}/podulebus/unixbpvar.h (96%) create mode 100644 sys/arch/acorn26/stand/Makefile rename sys/arch/{arm26 => acorn26}/stand/Makefile.buildboot (93%) rename sys/arch/{arm26 => acorn26}/stand/boot26/Makefile (83%) rename sys/arch/{arm26 => acorn26}/stand/boot26/boot26.c (99%) rename sys/arch/{arm26 => acorn26}/stand/boot26/rmheader.S (97%) rename sys/arch/{arm26 => acorn26}/stand/boot26/start.S (96%) rename sys/arch/{arm26 => acorn26}/stand/boot26/version (83%) rename sys/arch/{arm26 => acorn26}/stand/lib/Makefile (89%) rename sys/arch/{arm26 => acorn26}/stand/lib/Makefile.inc (94%) rename sys/arch/{arm26 => acorn26}/stand/lib/devopen.c (96%) rename sys/arch/{arm26 => acorn26}/stand/lib/newvers_rm.sh (97%) rename sys/arch/{arm26 => acorn26}/stand/lib/riscoscalls.S (94%) rename sys/arch/{arm26 => acorn26}/stand/lib/riscoscalls.h (90%) rename sys/arch/{arm26 => acorn26}/stand/lib/riscoscons.c (96%) create mode 100644 sys/arch/acorn26/stand/lib/riscosdisk.c create mode 100644 sys/arch/acorn26/stand/lib/riscosdisk.h rename sys/arch/{arm26 => acorn26}/stand/lib/riscoserrors.c (96%) rename sys/arch/{arm26 => acorn26}/stand/lib/riscosfile.c (98%) rename sys/arch/{arm26 => acorn26}/stand/lib/riscosfile.h (96%) rename sys/arch/{arm26 => acorn26}/stand/lib/srt0.S (96%) rename sys/arch/{arm26 => acorn26}/stand/lib/srt1.c (98%) rename sys/arch/{arm26 => acorn26}/vidc/arcvideo.c (97%) rename sys/arch/{arm26 => acorn26}/vidc/arcvideovar.h (96%) rename sys/arch/{arm26 => acorn26}/vidc/vidcreg.h (98%) rename sys/arch/{arm26 => acorn26}/vidc/vidmodes.c (100%) delete mode 100644 sys/arch/arm26/Makefile delete mode 100644 sys/arch/arm26/conf/std.arm26 delete mode 100644 sys/arch/arm26/include/ansi.h delete mode 100644 sys/arch/arm26/include/aout_machdep.h delete mode 100644 sys/arch/arm26/include/asm.h delete mode 100644 sys/arch/arm26/include/bootconfig.h delete mode 100644 sys/arch/arm26/include/bswap.h delete mode 100644 sys/arch/arm26/include/cdefs.h delete mode 100644 sys/arch/arm26/include/cpu.h delete mode 100644 sys/arch/arm26/include/disklabel.h delete mode 100644 sys/arch/arm26/include/elf_machdep.h delete mode 100644 sys/arch/arm26/include/endian.h delete mode 100644 sys/arch/arm26/include/endian_machdep.h delete mode 100644 sys/arch/arm26/include/float.h delete mode 100644 sys/arch/arm26/include/fp.h delete mode 100644 sys/arch/arm26/include/ieee.h delete mode 100644 sys/arch/arm26/include/ieeefp.h delete mode 100644 sys/arch/arm26/include/int_const.h delete mode 100644 sys/arch/arm26/include/int_fmtio.h delete mode 100644 sys/arch/arm26/include/int_limits.h delete mode 100644 sys/arch/arm26/include/int_mwgwtypes.h delete mode 100644 sys/arch/arm26/include/int_types.h delete mode 100644 sys/arch/arm26/include/limits.h delete mode 100644 sys/arch/arm26/include/lock.h delete mode 100644 sys/arch/arm26/include/math.h delete mode 100644 sys/arch/arm26/include/pcb.h delete mode 100644 sys/arch/arm26/include/profile.h delete mode 100644 sys/arch/arm26/include/ptrace.h delete mode 100644 sys/arch/arm26/include/reg.h delete mode 100644 sys/arch/arm26/include/setjmp.h delete mode 100644 sys/arch/arm26/include/signal.h delete mode 100644 sys/arch/arm26/include/stdarg.h delete mode 100644 sys/arch/arm26/include/sysarch.h delete mode 100644 sys/arch/arm26/include/trap.h delete mode 100644 sys/arch/arm26/include/types.h delete mode 100644 sys/arch/arm26/include/varargs.h delete mode 100644 sys/arch/arm26/stand/Makefile diff --git a/sys/arch/acorn26/Makefile b/sys/arch/acorn26/Makefile new file mode 100644 index 000000000000..554fc23d34d1 --- /dev/null +++ b/sys/arch/acorn26/Makefile @@ -0,0 +1,33 @@ +# $NetBSD: Makefile,v 1.1 2002/03/24 15:46:41 bjh21 Exp $ + +# Makefile for acorn26 tags file and boot blocks + +TACORN26= ../acorn26/tags +SACORN26= ../acorn26/acorn26/*.[ch] ../acorn26/include/*.h \ + ../acorn26/iobus/*.[ch] ../acorn26/ioc/*.[ch] ../arm32/mainbus/*.[ch] \ + ../acorn26/vidc/*.[ch] +AACORN26= ../acorn26/acorn26/*.S ../acorn26/iobus/*.S + +# Directories in which to place tags links +DACORN26= acorn26 include iobus ioc mainbus vidc + +.include "../../kern/Make.tags.inc" + +tags: TAGS + -ctags -wdtf ${TACORN26} ${SACORN26} ${COMM} + egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AACORN26} | \ + sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + >> ${TACORN26} + sort -o ${TACORN26} ${TACORN26} + +TAGS: + etags ${SACORN26} ${COMM} ${AACORN26} + +links: + -for i in ${DACORN26}; do \ + cd $$i && rm -f tags; ln -s ../tags tags; done + + +SUBDIR= stand include + +.include diff --git a/sys/arch/arm26/arm26/Locore.c b/sys/arch/acorn26/acorn26/Locore.c similarity index 97% rename from sys/arch/arm26/arm26/Locore.c rename to sys/arch/acorn26/acorn26/Locore.c index 1d3968dde8b5..a54f77d12100 100644 --- a/sys/arch/arm26/arm26/Locore.c +++ b/sys/arch/acorn26/acorn26/Locore.c @@ -1,4 +1,4 @@ -/* $NetBSD: Locore.c,v 1.7 2001/02/13 13:16:37 bjh21 Exp $ */ +/* $NetBSD: Locore.c,v 1.1 2002/03/24 15:46:42 bjh21 Exp $ */ /* * Copyright (c) 2000 Ben Harris. @@ -41,7 +41,7 @@ #include -__RCSID("$NetBSD: Locore.c,v 1.7 2001/02/13 13:16:37 bjh21 Exp $"); +__RCSID("$NetBSD: Locore.c,v 1.1 2002/03/24 15:46:42 bjh21 Exp $"); #include #include diff --git a/sys/arch/arm26/arm26/autoconf.c b/sys/arch/acorn26/acorn26/autoconf.c similarity index 93% rename from sys/arch/arm26/arm26/autoconf.c rename to sys/arch/acorn26/acorn26/autoconf.c index 4286eeadcfcb..fe23d08dd312 100644 --- a/sys/arch/arm26/arm26/autoconf.c +++ b/sys/arch/acorn26/acorn26/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.3 2001/08/25 17:55:24 bjh21 Exp $ */ +/* $NetBSD: autoconf.c,v 1.1 2002/03/24 15:46:42 bjh21 Exp $ */ /*- * Copyright (c) 1998, 1999 Ben Harris * All rights reserved. @@ -32,7 +32,7 @@ #include -__RCSID("$NetBSD: autoconf.c,v 1.3 2001/08/25 17:55:24 bjh21 Exp $"); +__RCSID("$NetBSD: autoconf.c,v 1.1 2002/03/24 15:46:42 bjh21 Exp $"); #include #include @@ -42,6 +42,8 @@ __RCSID("$NetBSD: autoconf.c,v 1.3 2001/08/25 17:55:24 bjh21 Exp $"); #include #include +struct device *booted_device; + void cpu_configure() { diff --git a/sys/arch/arm26/arm26/bus.c b/sys/arch/acorn26/acorn26/bus.c similarity index 97% rename from sys/arch/arm26/arm26/bus.c rename to sys/arch/acorn26/acorn26/bus.c index 72301cd496b8..1ea32578092c 100644 --- a/sys/arch/arm26/arm26/bus.c +++ b/sys/arch/acorn26/acorn26/bus.c @@ -1,4 +1,4 @@ -/* $NetBSD: bus.c,v 1.8 2001/06/12 20:16:22 bjh21 Exp $ */ +/* $NetBSD: bus.c,v 1.1 2002/03/24 15:46:42 bjh21 Exp $ */ /*- * Copyright (c) 1999, 2000 Ben Harris * All rights reserved. @@ -32,7 +32,7 @@ #include -__RCSID("$NetBSD: bus.c,v 1.8 2001/06/12 20:16:22 bjh21 Exp $"); +__RCSID("$NetBSD: bus.c,v 1.1 2002/03/24 15:46:42 bjh21 Exp $"); #include #include diff --git a/sys/arch/arm26/arm26/conf.c b/sys/arch/acorn26/acorn26/conf.c similarity index 98% rename from sys/arch/arm26/arm26/conf.c rename to sys/arch/acorn26/acorn26/conf.c index 1d49e4559341..a30bbebd0cf0 100644 --- a/sys/arch/arm26/arm26/conf.c +++ b/sys/arch/acorn26/acorn26/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.8 2002/01/12 12:36:31 manu Exp $ */ +/* $NetBSD: conf.c,v 1.1 2002/03/24 15:46:43 bjh21 Exp $ */ /*- * Copyright (c) 1998, 2000 Ben Harris * All rights reserved. @@ -32,7 +32,7 @@ #include -__RCSID("$NetBSD: conf.c,v 1.8 2002/01/12 12:36:31 manu Exp $"); +__RCSID("$NetBSD: conf.c,v 1.1 2002/03/24 15:46:43 bjh21 Exp $"); #include #include diff --git a/sys/arch/arm26/arm26/cons_machdep.c b/sys/arch/acorn26/acorn26/cons_machdep.c similarity index 94% rename from sys/arch/arm26/arm26/cons_machdep.c rename to sys/arch/acorn26/acorn26/cons_machdep.c index 0f7d309c7d3d..a25cac01d649 100644 --- a/sys/arch/arm26/arm26/cons_machdep.c +++ b/sys/arch/acorn26/acorn26/cons_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: cons_machdep.c,v 1.3 2001/03/11 16:31:05 bjh21 Exp $ */ +/* $NetBSD: cons_machdep.c,v 1.1 2002/03/24 15:46:43 bjh21 Exp $ */ /*- * Copyright (c) 1998 Ben Harris * All rights reserved. @@ -32,7 +32,7 @@ #include -__RCSID("$NetBSD: cons_machdep.c,v 1.3 2001/03/11 16:31:05 bjh21 Exp $"); +__RCSID("$NetBSD: cons_machdep.c,v 1.1 2002/03/24 15:46:43 bjh21 Exp $"); #include #include diff --git a/sys/arch/arm26/arm26/copyinout.S b/sys/arch/acorn26/acorn26/copyinout.S similarity index 98% rename from sys/arch/arm26/arm26/copyinout.S rename to sys/arch/acorn26/acorn26/copyinout.S index 2861a91e73f6..bf9b73ed2c88 100644 --- a/sys/arch/arm26/arm26/copyinout.S +++ b/sys/arch/acorn26/acorn26/copyinout.S @@ -1,4 +1,4 @@ -/* $NetBSD: copyinout.S,v 1.6 2001/08/20 22:56:10 bjh21 Exp $ */ +/* $NetBSD: copyinout.S,v 1.1 2002/03/24 15:46:43 bjh21 Exp $ */ /*- * Copyright (c) 2000 Ben Harris @@ -33,7 +33,7 @@ #include -RCSID("$NetBSD: copyinout.S,v 1.6 2001/08/20 22:56:10 bjh21 Exp $") +RCSID("$NetBSD: copyinout.S,v 1.1 2002/03/24 15:46:43 bjh21 Exp $") #include #include "assym.h" diff --git a/sys/arch/acorn26/acorn26/copyinoutstr.S b/sys/arch/acorn26/acorn26/copyinoutstr.S new file mode 100644 index 000000000000..031363cc857c --- /dev/null +++ b/sys/arch/acorn26/acorn26/copyinoutstr.S @@ -0,0 +1,232 @@ +/* $NetBSD: copyinoutstr.S,v 1.1 2002/03/24 15:46:43 bjh21 Exp $ */ + +/*- + * Copyright (c) 2000 Ben Harris + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */ +/* + * copyinout.S - copy data between user and kernel space + */ + +#include + +RCSID("$NetBSD: copyinoutstr.S,v 1.1 2002/03/24 15:46:43 bjh21 Exp $") + +#include +#include "assym.h" + +/* + * int copyin(const void *ua, void *ka, size_t len); + * int copyout(const void *ka, void *ua, size_t len); + * int kcopy(const void *src, void *dst, size_t len); + */ + +/* + * memcpy isn't currently data-abort-safe (it uses R14). This is much + * slower, but safer. + */ + +/* LINTSTUB: Func: int copyinstr(const void *uaddr, void *kaddr, size_t len, size_t *done) */ +ENTRY(copyinstr) + mov ip, sp + stmfd sp!, {r4, r5, r6, fp, ip, lr, pc} + sub fp, ip, #4 + adr r4, Lcopystrfault + ldr r5, Lcurproc + ldr r5, [r5] + ldr r5, [r5, #P_ADDR] + str r4, [r5, #(U_PCB + PCB_ONFAULT)] + mov r6, r1 +Lcopyinstrloop: + ldrbt r4, [r0], #1 + strb r4, [r1], #1 + subs r2, r2, #1 + teqne r4, #0 + bne Lcopyinstrloop + teq r3, #0 + subne r6, r1, r6 + strne r6, [r3] + mov r0, #0 + str r0, [r5, #(U_PCB + PCB_ONFAULT)] + teq r4, #0 + movne r0, #ENAMETOOLONG +#ifdef __APCS_26__ + ldmdb fp, {r4, r5, r6, fp, sp, pc}^ +#else + ldmdb fp, {r4, r5, r6, fp, sp, pc} +#endif + +/* LINTSTUB: Func: int copyoutstr(const void *kaddr, void *uaddr, size_t len, size_t *done) */ +ENTRY(copyoutstr) + mov ip, sp + stmfd sp!, {r4, r5, r6, fp, ip, lr, pc} + sub fp, ip, #4 + adr r4, Lcopystrfault + ldr r5, Lcurproc + ldr r5, [r5] + ldr r5, [r5, #P_ADDR] + str r4, [r5, #(U_PCB + PCB_ONFAULT)] + mov r6, r1 +Lcopyoutstrloop: + ldrb r4, [r0], #1 + strbt r4, [r1], #1 + subs r2, r2, #1 + teqne r4, #0 + bne Lcopyoutstrloop + teq r3, #0 + subne r6, r1, r6 + strne r6, [r3] + mov r0, #0 + str r0, [r5, #(U_PCB + PCB_ONFAULT)] + teq r4, #0 + movne r0, #ENAMETOOLONG +#ifdef __APCS_26__ + ldmdb fp, {r4, r5, r6, fp, sp, pc}^ +#else + ldmdb fp, {r4, r5, r6, fp, sp, pc} +#endif + +/* LINTSTUB: Func: int copystr(const void *kfaddr, void *kdaddr, size_t len, size_t *done) */ +ENTRY(copystr) + mov ip, sp + stmfd sp!, {r4, r5, r6, fp, ip, lr, pc} + sub fp, ip, #4 + adr r4, Lcopystrfault + ldr r5, Lcurproc + ldr r5, [r5] + ldr r5, [r5, #P_ADDR] + str r4, [r5, #(U_PCB + PCB_ONFAULT)] + mov r6, r1 +Lcopystrloop: + ldrb r4, [r0], #1 + strb r4, [r1], #1 + subs r2, r2, #1 + teqne r4, #0 + bne Lcopystrloop + teq r3, #0 + subne r6, r1, r6 + strne r6, [r3] + mov r0, #0 + str r0, [r5, #(U_PCB + PCB_ONFAULT)] + teq r4, #0 + movne r0, #ENAMETOOLONG + ldmdb fp, {r4, r5, r6, fp, sp, pc}^ + +Lcopystrfault: + teq r3, #0 + subne r6, r1, r6 + strne r6, [r3] + mov r1, #0 + str r1, [r5, #(U_PCB + PCB_ONFAULT)] + /* Return value is provided by fault handler. */ +#ifdef __APCS_26__ + ldmdb fp, {r4, r5, r6, fp, sp, pc}^ +#else + ldmdb fp, {r4, r5, r6, fp, sp, pc} +#endif + +/* LINTSTUB: Func: int fubyte(void *base) */ +ENTRY(fubyte) + mov ip, lr /* data-abort safety */ + adr r1, Lfusufault + ldr r2, Lcurproc + ldr r2, [r2] + ldr r2, [r2, #P_ADDR] + str r1, [r2, #(U_PCB + PCB_ONFAULT)] +/* XXX Warning: Rn and Rd must be different in LDRT */ + ldrbt r0, [r0] + mov r1, #0 + str r1, [r2, #(U_PCB + PCB_ONFAULT)] +#ifdef __APCS_26__ + movs pc, ip +#else + mov pc, ip +#endif + +/* LINTSTUB: Func: int fuword(void *base) */ +ENTRY(fuword) + mov ip, lr + adr r1, Lfusufault + ldr r2, Lcurproc + ldr r2, [r2] + ldr r2, [r2, #P_ADDR] + str r1, [r2, #(U_PCB + PCB_ONFAULT)] +/* XXX Warning: Rn and Rd must be different in LDRT */ + ldrt r0, [r0] + mov r1, #0 + str r1, [r2, #(U_PCB + PCB_ONFAULT)] +#ifdef __APCS_26__ + movs pc, ip +#else + mov pc, ip +#endif + +/* LINTSTUB: Func: int subyte(void *base, int c) */ +ENTRY(subyte) + mov ip, lr + adr r3, Lfusufault + ldr r2, Lcurproc + ldr r2, [r2] + ldr r2, [r2, #P_ADDR] + str r3, [r2, #(U_PCB + PCB_ONFAULT)] + strbt r1, [r0] + mov r0, #0 + str r0, [r2, #(U_PCB + PCB_ONFAULT)] +#ifdef __APCS_26__ + movs pc, ip +#else + mov pc, ip +#endif + +/* LINTSTUB: Func: int suword(void *base, long c) */ +ENTRY(suword) + mov ip, lr + adr r3, Lfusufault + ldr r2, Lcurproc + ldr r2, [r2] + ldr r2, [r2, #P_ADDR] + str r3, [r2, #(U_PCB + PCB_ONFAULT)] + strt r1, [r0] + mov r0, #0 + str r0, [r2, #(U_PCB + PCB_ONFAULT)] +#ifdef __APCS_26__ + movs pc, ip +#else + mov pc, ip +#endif + +Lfusufault: + mov r0, #0 + str r0, [r2, #(U_PCB + PCB_ONFAULT)] + mvn r0, #0 +#ifdef __APCS_26__ + movs pc, ip +#else + mov pc, ip +#endif + +Lcurproc: + .word _C_LABEL(curproc) diff --git a/sys/arch/arm26/arm26/cpu.c b/sys/arch/acorn26/acorn26/cpu.c similarity index 97% rename from sys/arch/arm26/arm26/cpu.c rename to sys/arch/acorn26/acorn26/cpu.c index 6b6bb14bf530..139044eb0474 100644 --- a/sys/arch/arm26/arm26/cpu.c +++ b/sys/arch/acorn26/acorn26/cpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.11 2001/08/20 12:20:05 wiz Exp $ */ +/* $NetBSD: cpu.c,v 1.1 2002/03/24 15:46:44 bjh21 Exp $ */ /*- * Copyright (c) 2000, 2001 Ben Harris @@ -33,7 +33,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.11 2001/08/20 12:20:05 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.1 2002/03/24 15:46:44 bjh21 Exp $"); #include #include @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.11 2001/08/20 12:20:05 wiz Exp $"); #include #include -#include +#include #include "opt_cputypes.h" @@ -193,7 +193,7 @@ arm2_undef_handler(u_int addr, u_int insn, struct trapframe *frame, /* * In order for the following macro to work, any function using it * must ensure that tf->r15 is copied into getreg(15). This is safe - * with the current trapframe layout on arm26, but be careful. + * with the current trapframe layout on acorn26, but be careful. */ #define getreg(r) (((register_t *)&tf->tf_r0)[r]) diff --git a/sys/arch/arm26/arm26/cpuvar.h b/sys/arch/acorn26/acorn26/cpuvar.h similarity index 96% rename from sys/arch/arm26/arm26/cpuvar.h rename to sys/arch/acorn26/acorn26/cpuvar.h index 96381a9b2780..96ea059db0e2 100644 --- a/sys/arch/arm26/arm26/cpuvar.h +++ b/sys/arch/acorn26/acorn26/cpuvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpuvar.h,v 1.1 2000/05/09 21:55:55 bjh21 Exp $ */ +/* $NetBSD: cpuvar.h,v 1.1 2002/03/24 15:46:44 bjh21 Exp $ */ /*- * Copyright (c) 2000 Ben Harris * All rights reserved. diff --git a/sys/arch/arm26/arm26/db_interface.c b/sys/arch/acorn26/acorn26/db_interface.c similarity index 99% rename from sys/arch/arm26/arm26/db_interface.c rename to sys/arch/acorn26/acorn26/db_interface.c index b49b5f5d8aca..a42de5bb750b 100644 --- a/sys/arch/arm26/arm26/db_interface.c +++ b/sys/arch/acorn26/acorn26/db_interface.c @@ -1,4 +1,4 @@ -/* $NetBSD: db_interface.c,v 1.13 2001/11/23 21:18:31 thorpej Exp $ */ +/* $NetBSD: db_interface.c,v 1.1 2002/03/24 15:46:44 bjh21 Exp $ */ /* * Copyright (c) 1996 Scott K. Stevens @@ -280,7 +280,7 @@ static struct undefined_handler db_uh; void db_machine_init() { -#ifndef arm26 +#ifndef acorn26 struct exec *kernexec = (struct exec *)KERNEL_TEXT_BASE; int len; diff --git a/sys/arch/arm26/arm26/db_machdep.c b/sys/arch/acorn26/acorn26/db_machdep.c similarity index 98% rename from sys/arch/arm26/arm26/db_machdep.c rename to sys/arch/acorn26/acorn26/db_machdep.c index 1bca01732f1f..d50ea7002baf 100644 --- a/sys/arch/arm26/arm26/db_machdep.c +++ b/sys/arch/acorn26/acorn26/db_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: db_machdep.c,v 1.6 2001/06/12 20:16:22 bjh21 Exp $ */ +/* $NetBSD: db_machdep.c,v 1.1 2002/03/24 15:46:45 bjh21 Exp $ */ /* * Copyright (c) 1996 Mark Brinicombe diff --git a/sys/arch/arm26/arm26/except.c b/sys/arch/acorn26/acorn26/except.c similarity index 98% rename from sys/arch/arm26/arm26/except.c rename to sys/arch/acorn26/acorn26/except.c index dbd2d51d09cb..7085c4623c4e 100644 --- a/sys/arch/arm26/arm26/except.c +++ b/sys/arch/acorn26/acorn26/except.c @@ -1,4 +1,4 @@ -/* $NetBSD: except.c,v 1.44 2002/02/14 11:54:16 bjh21 Exp $ */ +/* $NetBSD: except.c,v 1.1 2002/03/24 15:46:45 bjh21 Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 Ben Harris * All rights reserved. @@ -32,7 +32,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.44 2002/02/14 11:54:16 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.1 2002/03/24 15:46:45 bjh21 Exp $"); #include "opt_cputypes.h" #include "opt_ddb.h" diff --git a/sys/arch/arm26/arm26/fpu.c b/sys/arch/acorn26/acorn26/fpu.c similarity index 95% rename from sys/arch/arm26/arm26/fpu.c rename to sys/arch/acorn26/acorn26/fpu.c index 2df55560774c..dbac9a0f8a8d 100644 --- a/sys/arch/arm26/arm26/fpu.c +++ b/sys/arch/acorn26/acorn26/fpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.c,v 1.4 2001/03/13 21:00:13 bjh21 Exp $ */ +/* $NetBSD: fpu.c,v 1.1 2002/03/24 15:46:45 bjh21 Exp $ */ /*- * Copyright (c) 2000, 2001 Ben Harris @@ -33,7 +33,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.4 2001/03/13 21:00:13 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.1 2002/03/24 15:46:45 bjh21 Exp $"); #include #include @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.4 2001/03/13 21:00:13 bjh21 Exp $"); #include -#include +#include #include "opt_fputypes.h" diff --git a/sys/arch/arm26/arm26/fpu_asm.S b/sys/arch/acorn26/acorn26/fpu_asm.S similarity index 96% rename from sys/arch/arm26/arm26/fpu_asm.S rename to sys/arch/acorn26/acorn26/fpu_asm.S index 0ccab18033ca..985a4eff5edb 100644 --- a/sys/arch/arm26/arm26/fpu_asm.S +++ b/sys/arch/acorn26/acorn26/fpu_asm.S @@ -1,4 +1,4 @@ -/* $NetBSD: fpu_asm.S,v 1.2 2001/01/18 17:47:59 tv Exp $ */ +/* $NetBSD: fpu_asm.S,v 1.1 2002/03/24 15:46:45 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -33,7 +33,7 @@ #include -RCSID("$NetBSD: fpu_asm.S,v 1.2 2001/01/18 17:47:59 tv Exp $") +RCSID("$NetBSD: fpu_asm.S,v 1.1 2002/03/24 15:46:45 bjh21 Exp $") #include diff --git a/sys/arch/arm26/arm26/fpuvar.h b/sys/arch/acorn26/acorn26/fpuvar.h similarity index 97% rename from sys/arch/arm26/arm26/fpuvar.h rename to sys/arch/acorn26/acorn26/fpuvar.h index d0225d8abaf8..b283507b2c27 100644 --- a/sys/arch/arm26/arm26/fpuvar.h +++ b/sys/arch/acorn26/acorn26/fpuvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: fpuvar.h,v 1.1 2001/03/08 21:12:48 bjh21 Exp $ */ +/* $NetBSD: fpuvar.h,v 1.1 2002/03/24 15:46:45 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris diff --git a/sys/arch/arm26/arm26/genassym.cf b/sys/arch/acorn26/acorn26/genassym.cf similarity index 96% rename from sys/arch/arm26/arm26/genassym.cf rename to sys/arch/acorn26/acorn26/genassym.cf index ac91d9a902ba..be6953d2a74c 100644 --- a/sys/arch/arm26/arm26/genassym.cf +++ b/sys/arch/acorn26/acorn26/genassym.cf @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.5 2001/09/20 21:54:11 bjh21 Exp $ +# $NetBSD: genassym.cf,v 1.1 2002/03/24 15:46:46 bjh21 Exp $ # # Copyright (c) 1999 Ben Harris # All rights reserved. @@ -37,7 +37,7 @@ include if NECA > 0 include -include +include endif define U_PCB offsetof(struct user, u_pcb) diff --git a/sys/arch/arm26/arm26/irq.c b/sys/arch/acorn26/acorn26/irq.c similarity index 96% rename from sys/arch/arm26/arm26/irq.c rename to sys/arch/acorn26/acorn26/irq.c index 27a4c6e5da15..68d9c195721e 100644 --- a/sys/arch/arm26/arm26/irq.c +++ b/sys/arch/acorn26/acorn26/irq.c @@ -1,4 +1,4 @@ -/* $NetBSD: irq.c,v 1.25 2001/12/20 01:20:24 thorpej Exp $ */ +/* $NetBSD: irq.c,v 1.1 2002/03/24 15:46:46 bjh21 Exp $ */ /*- * Copyright (c) 2000, 2001 Ben Harris @@ -33,7 +33,7 @@ #include -__RCSID("$NetBSD: irq.c,v 1.25 2001/12/20 01:20:24 thorpej Exp $"); +__RCSID("$NetBSD: irq.c,v 1.1 2002/03/24 15:46:46 bjh21 Exp $"); #include #include /* for cold */ @@ -50,8 +50,8 @@ __RCSID("$NetBSD: irq.c,v 1.25 2001/12/20 01:20:24 thorpej Exp $"); #include #include -#include -#include +#include +#include #include "opt_ddb.h" #include "opt_flashything.h" @@ -66,10 +66,10 @@ __RCSID("$NetBSD: irq.c,v 1.25 2001/12/20 01:20:24 thorpej Exp $"); #include #endif #if NIOEB > 0 -#include +#include #endif #if NUNIXBP > 0 -#include +#include #endif #define NIRQ 20 @@ -315,7 +315,7 @@ void irq_genmasks() #ifdef FLASHYTHING #include -#include +#include static const int iplcolours[] = { VIDC_PALETTE_ENTRY( 0, 0, 0, 0), /* Black: IPL_NONE */ diff --git a/sys/arch/arm26/arm26/locore.S b/sys/arch/acorn26/acorn26/locore.S similarity index 99% rename from sys/arch/arm26/arm26/locore.S rename to sys/arch/acorn26/acorn26/locore.S index 1edff25d9715..bf56c728f0dc 100644 --- a/sys/arch/arm26/arm26/locore.S +++ b/sys/arch/acorn26/acorn26/locore.S @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.24 2001/12/21 22:56:18 bjh21 Exp $ */ +/* $NetBSD: locore.S,v 1.1 2002/03/24 15:46:46 bjh21 Exp $ */ /* * Copyright (c) 1998, 1999, 2000 Ben Harris * Copyright (C) 1994-1997 Mark Brinicombe @@ -457,4 +457,4 @@ _C_LABEL(intrcnt): .global _C_LABEL(eintrcnt) _C_LABEL(eintrcnt): -RCSID("$NetBSD: locore.S,v 1.24 2001/12/21 22:56:18 bjh21 Exp $") +RCSID("$NetBSD: locore.S,v 1.1 2002/03/24 15:46:46 bjh21 Exp $") diff --git a/sys/arch/arm26/arm26/machdep.c b/sys/arch/acorn26/acorn26/machdep.c similarity index 98% rename from sys/arch/arm26/arm26/machdep.c rename to sys/arch/acorn26/acorn26/machdep.c index 02c50bd17db0..a49f96d1afb8 100644 --- a/sys/arch/arm26/arm26/machdep.c +++ b/sys/arch/acorn26/acorn26/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.14 2002/03/18 21:14:34 bjh21 Exp $ */ +/* $NetBSD: machdep.c,v 1.1 2002/03/24 15:46:46 bjh21 Exp $ */ /*- * Copyright (c) 1998 Ben Harris @@ -33,7 +33,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2002/03/18 21:14:34 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1 2002/03/24 15:46:46 bjh21 Exp $"); #include #include diff --git a/sys/arch/arm26/arm26/mem.c b/sys/arch/acorn26/acorn26/mem.c similarity index 95% rename from sys/arch/arm26/arm26/mem.c rename to sys/arch/acorn26/acorn26/mem.c index 7eb24a284b54..578028d06dbe 100644 --- a/sys/arch/arm26/arm26/mem.c +++ b/sys/arch/acorn26/acorn26/mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: mem.c,v 1.5 2002/02/27 01:20:51 christos Exp $ */ +/* $NetBSD: mem.c,v 1.1 2002/03/24 15:46:46 bjh21 Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -137,7 +137,7 @@ mmrw(dev, uio, flags) error = uiomove((caddr_t)v, c, uio); else return (EFAULT); - continue; + break; case DEV_NULL: if (uio->uio_rw == UIO_WRITE) @@ -146,8 +146,8 @@ mmrw(dev, uio, flags) case DEV_ZERO: if (uio->uio_rw == UIO_WRITE) { - c = iov->iov_len; - break; + uio->uio_resid = 0; + return (0); } if (zeropage == NULL) { zeropage = (caddr_t) @@ -156,17 +156,11 @@ mmrw(dev, uio, flags) } c = min(iov->iov_len, NBPG); error = uiomove(zeropage, c, uio); - continue; + break; default: return (ENXIO); } - if (error) - break; - (caddr_t)iov->iov_base += c; - iov->iov_len -= c; - uio->uio_offset += c; - uio->uio_resid -= c; } if (minor(dev) == DEV_MEM) { /*unlock:*/ diff --git a/sys/arch/arm26/arm26/pmap.c b/sys/arch/acorn26/acorn26/pmap.c similarity index 99% rename from sys/arch/arm26/arm26/pmap.c rename to sys/arch/acorn26/acorn26/pmap.c index 87433cd62bb5..d46be53821d0 100644 --- a/sys/arch/arm26/arm26/pmap.c +++ b/sys/arch/acorn26/acorn26/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.37 2002/03/08 20:48:30 thorpej Exp $ */ +/* $NetBSD: pmap.c,v 1.1 2002/03/24 15:46:47 bjh21 Exp $ */ /*- * Copyright (c) 1997, 1998, 2000 Ben Harris * All rights reserved. @@ -105,7 +105,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.37 2002/03/08 20:48:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.1 2002/03/24 15:46:47 bjh21 Exp $"); #include /* for cold */ #include @@ -119,7 +119,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.37 2002/03/08 20:48:30 thorpej Exp $"); #include #include -#include +#include #ifdef PMAP_DEBUG_MODIFIED #include @@ -1113,7 +1113,7 @@ pmap_md4_page(unsigned char digest[16], paddr_t pa) /* * This is meant to return the range of kernel vm that is available - * after loading the kernel. Since NetBSD/arm26 runs the kernel from + * after loading the kernel. Since NetBSD/acorn26 runs the kernel from * physically-mapped space, we just return all of kernel vm. Oh, * except for the single page at the end where we map * otherwise-unmapped pages. diff --git a/sys/arch/arm26/arm26/rscons.c b/sys/arch/acorn26/acorn26/rscons.c similarity index 97% rename from sys/arch/arm26/arm26/rscons.c rename to sys/arch/acorn26/acorn26/rscons.c index af33f83c22ed..af88fb247705 100644 --- a/sys/arch/arm26/arm26/rscons.c +++ b/sys/arch/acorn26/acorn26/rscons.c @@ -1,4 +1,4 @@ -/* $NetBSD: rscons.c,v 1.1 2000/05/09 21:55:57 bjh21 Exp $ */ +/* $NetBSD: rscons.c,v 1.1 2002/03/24 15:46:47 bjh21 Exp $ */ /*- * Copyright (c) 1997, 1998 Ben Harris * All rights reserved. diff --git a/sys/arch/arm26/arm26/softintr.c b/sys/arch/acorn26/acorn26/softintr.c similarity index 96% rename from sys/arch/arm26/arm26/softintr.c rename to sys/arch/acorn26/acorn26/softintr.c index 310cacbd8e4f..2f0fc96517ff 100644 --- a/sys/arch/arm26/arm26/softintr.c +++ b/sys/arch/acorn26/acorn26/softintr.c @@ -1,4 +1,4 @@ -/* $NetBSD: softintr.c,v 1.10 2001/09/16 12:58:53 bjh21 Exp $ */ +/* $NetBSD: softintr.c,v 1.1 2002/03/24 15:46:47 bjh21 Exp $ */ /* * Copyright (c) 1999 Ben Harris. @@ -38,7 +38,7 @@ #include -__RCSID("$NetBSD: softintr.c,v 1.10 2001/09/16 12:58:53 bjh21 Exp $"); +__RCSID("$NetBSD: softintr.c,v 1.1 2002/03/24 15:46:47 bjh21 Exp $"); #include #include diff --git a/sys/arch/arm26/arm26/start.c b/sys/arch/acorn26/acorn26/start.c similarity index 97% rename from sys/arch/arm26/arm26/start.c rename to sys/arch/acorn26/acorn26/start.c index 5045e0a5f4c7..bca8c5178701 100644 --- a/sys/arch/arm26/arm26/start.c +++ b/sys/arch/acorn26/acorn26/start.c @@ -1,4 +1,4 @@ -/* $NetBSD: start.c,v 1.12 2001/08/25 17:55:24 bjh21 Exp $ */ +/* $NetBSD: start.c,v 1.1 2002/03/24 15:46:48 bjh21 Exp $ */ /*- * Copyright (c) 1998, 2000 Ben Harris * All rights reserved. @@ -32,7 +32,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: start.c,v 1.12 2001/08/25 17:55:24 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: start.c,v 1.1 2002/03/24 15:46:48 bjh21 Exp $"); #include #include @@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: start.c,v 1.12 2001/08/25 17:55:24 bjh21 Exp $"); #include "ioc.h" #if NIOC > 0 -#include +#include #endif extern void main __P((void)); /* XXX Should be in a header file */ diff --git a/sys/arch/arm26/arm26/stubs.c b/sys/arch/acorn26/acorn26/stubs.c similarity index 89% rename from sys/arch/arm26/arm26/stubs.c rename to sys/arch/acorn26/acorn26/stubs.c index e5a4d34cac4b..158bc5cbfde4 100644 --- a/sys/arch/arm26/arm26/stubs.c +++ b/sys/arch/acorn26/acorn26/stubs.c @@ -1,11 +1,11 @@ -/* $NetBSD: stubs.c,v 1.10 2001/11/16 13:48:33 bjh21 Exp $ */ +/* $NetBSD: stubs.c,v 1.1 2002/03/24 15:46:48 bjh21 Exp $ */ /* * stubs.c -- functions I haven't written yet */ #include -__RCSID("$NetBSD: stubs.c,v 1.10 2001/11/16 13:48:33 bjh21 Exp $"); +__RCSID("$NetBSD: stubs.c,v 1.1 2002/03/24 15:46:48 bjh21 Exp $"); #include #include diff --git a/sys/arch/arm26/arm26/sys_machdep.c b/sys/arch/acorn26/acorn26/sys_machdep.c similarity index 94% rename from sys/arch/arm26/arm26/sys_machdep.c rename to sys/arch/acorn26/acorn26/sys_machdep.c index 89f1b0d8270b..d79e6564aeb9 100644 --- a/sys/arch/arm26/arm26/sys_machdep.c +++ b/sys/arch/acorn26/acorn26/sys_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: sys_machdep.c,v 1.1 2001/07/28 19:12:50 bjh21 Exp $ */ +/* $NetBSD: sys_machdep.c,v 1.1 2002/03/24 15:46:48 bjh21 Exp $ */ /* * Copyright (c) 1995-1997 Mark Brinicombe. @@ -42,7 +42,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.1 2001/07/28 19:12:50 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.1 2002/03/24 15:46:48 bjh21 Exp $"); #include #include diff --git a/sys/arch/arm26/arm26/vm_machdep.c b/sys/arch/acorn26/acorn26/vm_machdep.c similarity index 98% rename from sys/arch/arm26/arm26/vm_machdep.c rename to sys/arch/acorn26/acorn26/vm_machdep.c index fe8ee854489b..405f352333ba 100644 --- a/sys/arch/arm26/arm26/vm_machdep.c +++ b/sys/arch/acorn26/acorn26/vm_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.20 2002/03/04 02:43:23 simonb Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.1 2002/03/24 15:46:49 bjh21 Exp $ */ /*- * Copyright (c) 2000, 2001 Ben Harris @@ -66,7 +66,7 @@ #include -__RCSID("$NetBSD: vm_machdep.c,v 1.20 2002/03/04 02:43:23 simonb Exp $"); +__RCSID("$NetBSD: vm_machdep.c,v 1.1 2002/03/24 15:46:49 bjh21 Exp $"); #include #include /* XXX syscallargs.h uses fhandle_t and fsid_t */ diff --git a/sys/arch/arm26/compile/.keep_me b/sys/arch/acorn26/compile/.keep_me similarity index 100% rename from sys/arch/arm26/compile/.keep_me rename to sys/arch/acorn26/compile/.keep_me diff --git a/sys/arch/arm26/conf/FOURMEG b/sys/arch/acorn26/conf/FOURMEG similarity index 99% rename from sys/arch/arm26/conf/FOURMEG rename to sys/arch/acorn26/conf/FOURMEG index 3cecdc7b3c4e..09cd2985b507 100644 --- a/sys/arch/arm26/conf/FOURMEG +++ b/sys/arch/acorn26/conf/FOURMEG @@ -1,4 +1,4 @@ -# $NetBSD: FOURMEG,v 1.23 2002/03/10 19:56:39 lukem Exp $ +# $NetBSD: FOURMEG,v 1.1 2002/03/24 15:46:50 bjh21 Exp $ # FOURMEG arm26 configuration -- something small diff --git a/sys/arch/arm26/conf/GENERIC b/sys/arch/acorn26/conf/GENERIC similarity index 98% rename from sys/arch/arm26/conf/GENERIC rename to sys/arch/acorn26/conf/GENERIC index 09c5cbadec6d..cddc9c22e97d 100644 --- a/sys/arch/arm26/conf/GENERIC +++ b/sys/arch/acorn26/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.34 2002/03/10 19:56:39 lukem Exp $ +# $NetBSD: GENERIC,v 1.1 2002/03/24 15:46:50 bjh21 Exp $ # # GENERIC machine description file # @@ -18,7 +18,7 @@ # of each device driver in this file see the section 4 man page for the # device. -include "arch/arm26/conf/std.arm26" +include "arch/acorn26/conf/std.acorn26" maxusers 8 @@ -93,7 +93,7 @@ options INET6 # IPV6 #options COMPAT_43 # 4.3BSD compatibility. # Binary compatibility with previous versions of NetBSD. -# None yet, since NetBSD/arm26 hasn't been released. +# None yet, since NetBSD/acorn26 hasn't been released. # System V IPC options SYSVMSG # System V-like message queues diff --git a/sys/arch/arm26/conf/Makefile.arm26 b/sys/arch/acorn26/conf/Makefile.acorn26 similarity index 78% rename from sys/arch/arm26/conf/Makefile.arm26 rename to sys/arch/acorn26/conf/Makefile.acorn26 index ab3e6851c6b2..03a67b8fe693 100644 --- a/sys/arch/arm26/conf/Makefile.arm26 +++ b/sys/arch/acorn26/conf/Makefile.acorn26 @@ -1,15 +1,15 @@ -# $NetBSD: Makefile.arm26,v 1.20 2002/03/07 23:15:23 bjh21 Exp $ +# $NetBSD: Makefile.acorn26,v 1.1 2002/03/24 15:46:51 bjh21 Exp $ # Makefile for NetBSD # # This makefile is constructed from a machine description: # config machineid # Most changes should be made in the machine description -# /sys/arch/arm26/conf/``machineid'' +# /sys/arch/acorn26/conf/``machineid'' # after which you should do # config machineid # Machine generic makefile changes should be made in -# /sys/arch/arm26/conf/Makefile.i386 +# /sys/arch/acorn26/conf/Makefile.i386 # after which config should be rerun for all machines of that type. # # To specify debugging, add the config line: makeoptions DEBUG="-g" @@ -25,19 +25,19 @@ NEED_OWN_INSTALL_TARGET?=no ## (1) port identification ## ARM= $S/arch/arm -ARM26= $S/arch/arm26 -GENASSYM= ${ARM26}/arm26/genassym.cf +ACORN26= $S/arch/acorn26 +GENASSYM= ${ACORN26}/acorn26/genassym.cf ## ## (2) compile settings ## -CPPFLAGS+= -Darm26 +CPPFLAGS+= -Dacorn26 CWARNFLAGS+= -Wcomment LOOSE_PROTOTYPES= yes # We'd like GCC to leave R14 alone as much as possible (so page faults in the # kernel are safer). CFLAGS+= -ffixed-r14 -# arm26 systems can safely do unaligned loads. +# acorn26 systems can safely do unaligned loads. CFLAGS+= -mshort-load-words AFLAGS+= -x assembler-with-cpp -traditional-cpp @@ -50,9 +50,9 @@ AFLAGS+= -x assembler-with-cpp -traditional-cpp ## MD_OBJS= vectors.o locore.o MD_CFILES= -MD_SFILES= ${ARM}/arm/vectors.S ${ARM26}/arm26/locore.S +MD_SFILES= ${ARM}/arm/vectors.S ${ACORN26}/acorn26/locore.S -locore.o: ${ARM26}/arm26/locore.S assym.h +locore.o: ${ACORN26}/acorn26/locore.S assym.h ${NORMAL_S} vectors.o: ${ARM}/arm/vectors.S diff --git a/sys/arch/arm26/conf/files.arm26 b/sys/arch/acorn26/conf/files.acorn26 similarity index 69% rename from sys/arch/arm26/conf/files.arm26 rename to sys/arch/acorn26/conf/files.acorn26 index 195423627a36..424043413ebb 100644 --- a/sys/arch/arm26/conf/files.arm26 +++ b/sys/arch/acorn26/conf/files.acorn26 @@ -1,4 +1,4 @@ -# $NetBSD: files.arm26,v 1.45 2002/03/17 12:00:56 bjh21 Exp $ +# $NetBSD: files.acorn26,v 1.1 2002/03/24 15:46:51 bjh21 Exp $ # Copyright (c) 1997, 1998, 2000 Ben Harris # All rights reserved. @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. +# This file is part of NetBSD/acorn26 -- a port of NetBSD to ARM2/3 machines. maxpartitions 8 maxusers 2 8 64 @@ -48,48 +48,53 @@ define fiq # CPU #device cpu { } attach cpu at root with cpu_root -file arch/arm26/arm26/cpu.c cpu +file arch/acorn26/acorn26/cpu.c cpu # Floating-point unit device fpu attach fpu at cpu defflag opt_fputypes.h FPU_FPPC FPU_FPA -file arch/arm26/arm26/fpu.c fpu needs-flag -file arch/arm26/arm26/fpu_asm.S fpu +file arch/acorn26/acorn26/fpu.c fpu needs-flag +file arch/acorn26/acorn26/fpu_asm.S fpu # I/O bus (on the far side of the address and data latches) device iobus { base = -1 } attach iobus at root -file arch/arm26/iobus/iobus.c iobus +file arch/acorn26/iobus/iobus.c iobus # 82C710/1 on A5000 etc will be at iobus0 base 0x00010000 (and 0x00012000???) # I/O controller (Albion) (usually at iobus0 base 0x00200000) device ioc { [bank = -1], [offset = 0] } attach ioc at iobus -file arch/arm26/iobus/ioc.c ioc needs-flag -file arch/arm26/ioc/ioc_fiq_util.S fiq needs-flag +file arch/acorn26/iobus/ioc.c ioc needs-flag +file arch/acorn26/ioc/ioc_fiq_util.S fiq needs-flag # I^2C bus (bit-banged through IOC control register) device iic { addr = -1 } attach iic at ioc -file arch/arm26/ioc/iic.c iic +file arch/acorn26/ioc/iic.c iic # PCF8583 I^2C Clock/calendar/RAM device rtc attach rtc at iic -file arch/arm26/ioc/rtc.c rtc +file arch/acorn26/ioc/rtc.c rtc file dev/clock_subr.c rtc +# DS2401 Silicon Serial Number +device ssn +attach ssn at ioc +file arch/acorn26/ioc/ssn.c ssn + # I/O Extension Block (usually at ioc0 bank 5) device ioeb { [offset = -1] } attach ioeb at ioc -file arch/arm26/ioc/ioeb.c ioeb needs-flag +file arch/acorn26/ioc/ioeb.c ioeb needs-flag # Latches (random internal use) (usually at ioc0 bank 5) device latches attach latches at ioc -file arch/arm26/ioc/latches.c latches +file arch/acorn26/ioc/latches.c latches # On-board keyboard interface device arckbd { } @@ -98,9 +103,9 @@ device arcwskbd: wskbddev attach arcwskbd at arckbd device arcwsmouse: wsmousedev attach arcwsmouse at arckbd -file arch/arm26/ioc/arckbd.c arckbd | arcwskbd | arcwsmouse +file arch/acorn26/ioc/arckbd.c arckbd | arcwskbd | arcwsmouse needs-flag -file arch/arm26/ioc/arckbdmap.c arckbd +file arch/acorn26/ioc/arckbdmap.c arckbd # On-board WD 1772 floppy controller (usually at bank 1 irq 12 fiq 0/1) # Not to be confused with fdc, which will be the PC-style one on A5k etc. @@ -114,18 +119,18 @@ attach wf at wfdc # Econet module (Motorola 6854) (usually at bank 2 fiq 2) device eca: fiq, eco, ifnet attach eca at ioc -file arch/arm26/ioc/if_eca.c eca needs-flag -file arch/arm26/ioc/if_eca_fiq.S eca +file arch/acorn26/ioc/if_eca.c eca needs-flag +file arch/acorn26/ioc/if_eca_fiq.S eca # On-board Rockwell 6551 serial (usually at bank 3 irq 10/1) device rs: tty attach rs at ioc -file arch/arm26/arm26/rscons.c rs needs-flag +file arch/acorn26/acorn26/rscons.c rs needs-flag # On-board printer port (usually at bank 5 addr 0x10 irq 0/2) device arcpp attach arcpp at ioc -file arch/arm26/ioc/arcpp.c arcpp needs-flag +file arch/acorn26/ioc/arcpp.c arcpp needs-flag # Podule interface (podules listed later) (usually at bank 4 irq 13 fiq 6) @@ -138,9 +143,9 @@ attach unixbp at ioc # attachments in the right order. include "dev/podulebus/files.podulebus" attach podulebus at ioc -file arch/arm26/podulebus/podulebus.c podulebus -file arch/arm26/podulebus/podloader_asm.S podloader needs-flag -file arch/arm26/podulebus/unixbp.c unixbp needs-flag +file arch/acorn26/podulebus/podulebus.c podulebus +file arch/acorn26/podulebus/podloader_asm.S podloader needs-flag +file arch/acorn26/podulebus/unixbp.c unixbp needs-flag # Acorn ST506 interface (usually at bank 5 irq 11, or sometimes on a podule) device hdc { drive = -1 } @@ -153,7 +158,7 @@ attach hd at hdc # VIDC/MEMC audio/video subsystems. device arcvideo: rasops1, rasops2, rasops4, rasops8, wsemuldisplaydev attach arcvideo at root -file arch/arm26/vidc/arcvideo.c arcvideo needs-flag +file arch/acorn26/vidc/arcvideo.c arcvideo needs-flag device arcaudio: audio attach arcaudio at root @@ -171,7 +176,7 @@ file dev/ic/lpt_upc.c lpt_upc # This section belongs here attach upc at iobus with upc_iobus -file arch/arm26/iobus/upc_iobus.c upc_iobus +file arch/acorn26/iobus/upc_iobus.c upc_iobus ### # Assorted podules @@ -180,12 +185,12 @@ file arch/arm26/iobus/upc_iobus.c upc_iobus # i-cubed EtherLAN 100, 200 and 500 device eh: ether, ifnet, arp, dp8390nic, podloader attach eh at podulebus -file arch/arm26/podulebus/if_eh.c eh +file arch/acorn26/podulebus/if_eh.c eh # PowerROM test driver device powerrom: podloader attach powerrom at podulebus -file arch/arm26/podulebus/powerrom.c powerrom +file arch/acorn26/podulebus/powerrom.c powerrom # Memory disk for installation (or ROM versions?) file dev/md_root.c memory_disk_hooks @@ -198,27 +203,27 @@ major { md = 1 } #file dev/cons.c file dev/cninit.c -file arch/arm26/arm26/db_interface.c ddb -file arch/arm26/arm26/db_machdep.c ddb +file arch/acorn26/acorn26/db_interface.c ddb +file arch/acorn26/acorn26/db_machdep.c ddb -file arch/arm26/arm26/start.c -file arch/arm26/arm26/autoconf.c -file arch/arm26/arm26/bus.c -file arch/arm26/arm26/conf.c -file arch/arm26/arm26/cons_machdep.c -file arch/arm26/arm26/copyinout.S -file arch/arm26/arm26/except.c -file arch/arm26/arm26/irq.c -file arch/arm26/arm26/Locore.c -file arch/arm26/arm26/machdep.c -file arch/arm26/arm26/mem.c -file arch/arm26/arm26/pmap.c -#file arch/arm26/arm26/rscons.c -file arch/arm26/arm26/softintr.c -file arch/arm26/arm26/stubs.c -file arch/arm26/arm26/sys_machdep.c -file arch/arm26/arm26/vm_machdep.c +file arch/acorn26/acorn26/start.c +file arch/acorn26/acorn26/autoconf.c +file arch/acorn26/acorn26/bus.c +file arch/acorn26/acorn26/conf.c +file arch/acorn26/acorn26/cons_machdep.c +file arch/acorn26/acorn26/copyinout.S +file arch/acorn26/acorn26/except.c +file arch/acorn26/acorn26/irq.c +file arch/acorn26/acorn26/Locore.c +file arch/acorn26/acorn26/machdep.c +file arch/acorn26/acorn26/mem.c +file arch/acorn26/acorn26/pmap.c +#file arch/acorn26/acorn26/rscons.c +file arch/acorn26/acorn26/softintr.c +file arch/acorn26/acorn26/stubs.c +file arch/acorn26/acorn26/sys_machdep.c +file arch/acorn26/acorn26/vm_machdep.c -file arch/arm/arm/disksubr.c disk -file arch/arm/arm/disksubr_acorn.c disk -file arch/arm/arm/disksubr_mbr.c disk +file arch/arm/arm/disksubr.c disk +file arch/arm/arm/disksubr_acorn.c disk +file arch/arm/arm/disksubr_mbr.c disk diff --git a/sys/arch/acorn26/conf/std.acorn26 b/sys/arch/acorn26/conf/std.acorn26 new file mode 100644 index 000000000000..231306890b58 --- /dev/null +++ b/sys/arch/acorn26/conf/std.acorn26 @@ -0,0 +1,6 @@ +# $NetBSD: std.acorn26,v 1.1 2002/03/24 15:46:51 bjh21 Exp $ + +# Standard NetBSD/acorn26 options + +machine acorn26 arm + diff --git a/sys/arch/arm26/include/Makefile b/sys/arch/acorn26/include/Makefile similarity index 79% rename from sys/arch/arm26/include/Makefile rename to sys/arch/acorn26/include/Makefile index 32bc5d57262b..0a6d5d023c50 100644 --- a/sys/arch/arm26/include/Makefile +++ b/sys/arch/acorn26/include/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2001/11/25 16:22:48 thorpej Exp $ +# $NetBSD: Makefile,v 1.1 2002/03/24 15:46:52 bjh21 Exp $ -KDIR= /sys/arch/arm26/include -INCSDIR= /usr/include/arm26 +KDIR= /sys/arch/acorn26/include +INCSDIR= /usr/include/acorn26 INCS= ansi.h aout_machdep.h asm.h \ boot.h bswap.h bus.h \ diff --git a/sys/arch/acorn26/include/ansi.h b/sys/arch/acorn26/include/ansi.h new file mode 100644 index 000000000000..2672a9711170 --- /dev/null +++ b/sys/arch/acorn26/include/ansi.h @@ -0,0 +1,3 @@ +/* $NetBSD: ansi.h,v 1.1 2002/03/24 15:46:52 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/aout_machdep.h b/sys/arch/acorn26/include/aout_machdep.h new file mode 100644 index 000000000000..e9c4a4584c69 --- /dev/null +++ b/sys/arch/acorn26/include/aout_machdep.h @@ -0,0 +1,3 @@ +/* $NetBSD: aout_machdep.h,v 1.1 2002/03/24 15:46:52 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/asm.h b/sys/arch/acorn26/include/asm.h new file mode 100644 index 000000000000..889e40af45b2 --- /dev/null +++ b/sys/arch/acorn26/include/asm.h @@ -0,0 +1,3 @@ +/* $NetBSD: asm.h,v 1.1 2002/03/24 15:46:53 bjh21 Exp $ */ + +#include diff --git a/sys/arch/arm26/include/boot.h b/sys/arch/acorn26/include/boot.h similarity index 98% rename from sys/arch/arm26/include/boot.h rename to sys/arch/acorn26/include/boot.h index a35eb16d5930..ca98fa03ae80 100644 --- a/sys/arch/arm26/include/boot.h +++ b/sys/arch/acorn26/include/boot.h @@ -1,4 +1,4 @@ -/* $NetBSD: boot.h,v 1.2 2001/07/28 12:53:06 bjh21 Exp $ */ +/* $NetBSD: boot.h,v 1.1 2002/03/24 15:46:53 bjh21 Exp $ */ /*- * Copyright (c) 1998 Ben Harris * All rights reserved. diff --git a/sys/arch/acorn26/include/bootconfig.h b/sys/arch/acorn26/include/bootconfig.h new file mode 100644 index 000000000000..ddb17eb82af7 --- /dev/null +++ b/sys/arch/acorn26/include/bootconfig.h @@ -0,0 +1,3 @@ +/* $NetBSD: bootconfig.h,v 1.1 2002/03/24 15:46:53 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/bswap.h b/sys/arch/acorn26/include/bswap.h new file mode 100644 index 000000000000..44f158a1905c --- /dev/null +++ b/sys/arch/acorn26/include/bswap.h @@ -0,0 +1,3 @@ +/* $NetBSD: bswap.h,v 1.1 2002/03/24 15:46:54 bjh21 Exp $ */ + +#include diff --git a/sys/arch/arm26/include/bus.h b/sys/arch/acorn26/include/bus.h similarity index 96% rename from sys/arch/arm26/include/bus.h rename to sys/arch/acorn26/include/bus.h index 934fa9fcd76c..ba603bdbf567 100644 --- a/sys/arch/arm26/include/bus.h +++ b/sys/arch/acorn26/include/bus.h @@ -1,4 +1,4 @@ -/* $NetBSD: bus.h,v 1.7 2001/11/16 13:34:03 bjh21 Exp $ */ +/* $NetBSD: bus.h,v 1.1 2002/03/24 15:46:54 bjh21 Exp $ */ /*- * Copyright (c) 2000 Ben Harris @@ -31,8 +31,8 @@ * bus.h - Bus space functions for brivers */ -#ifndef _ARM26_BUS_H_ -#define _ARM26_BUS_H_ +#ifndef _ACORN26_BUS_H_ +#define _ACORN26_BUS_H_ #include @@ -70,7 +70,7 @@ extern int bus_space_shift(bus_space_tag_t, bus_space_handle_t, int, #define bus_space_alloc(t, rs, re, s, a, b, c, ap, hp) (-1) #define bus_space_free(t, h, s) /* Do nothing */ -/* Mapping bus space into user address space (impossible on arm26) */ +/* Mapping bus space into user address space (impossible on acorn26) */ #define bus_space_mmap(t, a, o, p, f) (-1) /* Used by ne2000.c */ @@ -145,4 +145,4 @@ extern void bus_space_copy_region_2(bus_space_tag_t, bus_space_handle_t, typedef void *bus_dmamap_t; -#endif /* _ARM26_BUS_H_ */ +#endif /* _ACORN26_BUS_H_ */ diff --git a/sys/arch/acorn26/include/cdefs.h b/sys/arch/acorn26/include/cdefs.h new file mode 100644 index 000000000000..122e34b7df68 --- /dev/null +++ b/sys/arch/acorn26/include/cdefs.h @@ -0,0 +1,3 @@ +/* $NetBSD: cdefs.h,v 1.1 2002/03/24 15:46:55 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/cpu.h b/sys/arch/acorn26/include/cpu.h new file mode 100644 index 000000000000..3f4d952a401c --- /dev/null +++ b/sys/arch/acorn26/include/cpu.h @@ -0,0 +1,3 @@ +/* $NetBSD: cpu.h,v 1.1 2002/03/24 15:46:55 bjh21 Exp $ */ + +#include diff --git a/sys/arch/arm26/include/db_machdep.h b/sys/arch/acorn26/include/db_machdep.h similarity index 80% rename from sys/arch/arm26/include/db_machdep.h rename to sys/arch/acorn26/include/db_machdep.h index ac38f7179028..2db150c0a5e4 100644 --- a/sys/arch/arm26/include/db_machdep.h +++ b/sys/arch/acorn26/include/db_machdep.h @@ -1,8 +1,8 @@ -/* $NetBSD: db_machdep.h,v 1.6 2001/11/16 14:39:31 bjh21 Exp $ */ +/* $NetBSD: db_machdep.h,v 1.1 2002/03/24 15:46:55 bjh21 Exp $ */ #include -/* arm26 uses ELF */ +/* acorn26 uses ELF */ #undef DB_AOUT_SYMBOLS #define DB_ELF_SYMBOLS #define DB_ELFSIZE 32 diff --git a/sys/arch/acorn26/include/disklabel.h b/sys/arch/acorn26/include/disklabel.h new file mode 100644 index 000000000000..91644330e869 --- /dev/null +++ b/sys/arch/acorn26/include/disklabel.h @@ -0,0 +1,3 @@ +/* $NetBSD: disklabel.h,v 1.1 2002/03/24 15:46:56 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/elf_machdep.h b/sys/arch/acorn26/include/elf_machdep.h new file mode 100644 index 000000000000..d35353442652 --- /dev/null +++ b/sys/arch/acorn26/include/elf_machdep.h @@ -0,0 +1,3 @@ +/* $NetBSD: elf_machdep.h,v 1.1 2002/03/24 15:46:56 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/endian.h b/sys/arch/acorn26/include/endian.h new file mode 100644 index 000000000000..508605e60c9d --- /dev/null +++ b/sys/arch/acorn26/include/endian.h @@ -0,0 +1,3 @@ +/* $NetBSD: endian.h,v 1.1 2002/03/24 15:46:56 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/endian_machdep.h b/sys/arch/acorn26/include/endian_machdep.h new file mode 100644 index 000000000000..a0be1b73a4fb --- /dev/null +++ b/sys/arch/acorn26/include/endian_machdep.h @@ -0,0 +1,3 @@ +/* $NetBSD: endian_machdep.h,v 1.1 2002/03/24 15:46:57 bjh21 Exp $ */ + +#include diff --git a/sys/arch/arm26/include/fiq.h b/sys/arch/acorn26/include/fiq.h similarity index 93% rename from sys/arch/arm26/include/fiq.h rename to sys/arch/acorn26/include/fiq.h index 0810dfd05e43..9164cdb2e7b5 100644 --- a/sys/arch/arm26/include/fiq.h +++ b/sys/arch/acorn26/include/fiq.h @@ -1,4 +1,4 @@ -/* $NetBSD: fiq.h,v 1.4 2001/12/20 01:20:25 thorpej Exp $ */ +/* $NetBSD: fiq.h,v 1.1 2002/03/24 15:46:57 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -27,9 +27,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ARM26_FIQ_H_ -#define _ARM26_FIQ_H_ -#include +#ifndef _ACORN26_FIQ_H_ +#define _ACORN26_FIQ_H_ +#include /* * These definitions specify how the devices are wired to the IOC diff --git a/sys/arch/acorn26/include/float.h b/sys/arch/acorn26/include/float.h new file mode 100644 index 000000000000..ab8ec610507e --- /dev/null +++ b/sys/arch/acorn26/include/float.h @@ -0,0 +1,3 @@ +/* $NetBSD: float.h,v 1.1 2002/03/24 15:46:57 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/fp.h b/sys/arch/acorn26/include/fp.h new file mode 100644 index 000000000000..f51bd17c422e --- /dev/null +++ b/sys/arch/acorn26/include/fp.h @@ -0,0 +1,3 @@ +/* $NetBSD: fp.h,v 1.1 2002/03/24 15:46:57 bjh21 Exp $ */ + +#include diff --git a/sys/arch/arm26/include/fpureg.h b/sys/arch/acorn26/include/fpureg.h similarity index 97% rename from sys/arch/arm26/include/fpureg.h rename to sys/arch/acorn26/include/fpureg.h index 128bdcef84d1..cb1ed7c24acc 100644 --- a/sys/arch/arm26/include/fpureg.h +++ b/sys/arch/acorn26/include/fpureg.h @@ -1,4 +1,4 @@ -/* $NetBSD: fpureg.h,v 1.1 2000/12/23 13:37:03 bjh21 Exp $ */ +/* $NetBSD: fpureg.h,v 1.1 2002/03/24 15:46:58 bjh21 Exp $ */ /* * ARM FPU definitions diff --git a/sys/arch/arm26/include/frame.h b/sys/arch/acorn26/include/frame.h similarity index 98% rename from sys/arch/arm26/include/frame.h rename to sys/arch/acorn26/include/frame.h index f6beedd3fa4e..a7f7184580a9 100644 --- a/sys/arch/arm26/include/frame.h +++ b/sys/arch/acorn26/include/frame.h @@ -1,4 +1,4 @@ -/* $NetBSD: frame.h,v 1.7 2001/08/31 04:44:55 simonb Exp $ */ +/* $NetBSD: frame.h,v 1.1 2002/03/24 15:46:58 bjh21 Exp $ */ /* * Copyright (c) 1999 Ben Harris. diff --git a/sys/arch/acorn26/include/ieee.h b/sys/arch/acorn26/include/ieee.h new file mode 100644 index 000000000000..131fc119c342 --- /dev/null +++ b/sys/arch/acorn26/include/ieee.h @@ -0,0 +1,3 @@ +/* $NetBSD: ieee.h,v 1.1 2002/03/24 15:46:59 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/ieeefp.h b/sys/arch/acorn26/include/ieeefp.h new file mode 100644 index 000000000000..688a4dd778d6 --- /dev/null +++ b/sys/arch/acorn26/include/ieeefp.h @@ -0,0 +1,3 @@ +/* $NetBSD: ieeefp.h,v 1.1 2002/03/24 15:46:59 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/int_const.h b/sys/arch/acorn26/include/int_const.h new file mode 100644 index 000000000000..d2ff70417796 --- /dev/null +++ b/sys/arch/acorn26/include/int_const.h @@ -0,0 +1,3 @@ +/* $NetBSD: int_const.h,v 1.1 2002/03/24 15:47:00 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/int_fmtio.h b/sys/arch/acorn26/include/int_fmtio.h new file mode 100644 index 000000000000..3107ac89d349 --- /dev/null +++ b/sys/arch/acorn26/include/int_fmtio.h @@ -0,0 +1,3 @@ +/* $NetBSD: int_fmtio.h,v 1.1 2002/03/24 15:47:00 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/int_limits.h b/sys/arch/acorn26/include/int_limits.h new file mode 100644 index 000000000000..4eb79dee0653 --- /dev/null +++ b/sys/arch/acorn26/include/int_limits.h @@ -0,0 +1,3 @@ +/* $NetBSD: int_limits.h,v 1.1 2002/03/24 15:47:00 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/int_mwgwtypes.h b/sys/arch/acorn26/include/int_mwgwtypes.h new file mode 100644 index 000000000000..4546add1b07d --- /dev/null +++ b/sys/arch/acorn26/include/int_mwgwtypes.h @@ -0,0 +1,3 @@ +/* $NetBSD: int_mwgwtypes.h,v 1.1 2002/03/24 15:47:01 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/int_types.h b/sys/arch/acorn26/include/int_types.h new file mode 100644 index 000000000000..69bd34f4c117 --- /dev/null +++ b/sys/arch/acorn26/include/int_types.h @@ -0,0 +1,3 @@ +/* $NetBSD: int_types.h,v 1.1 2002/03/24 15:47:01 bjh21 Exp $ */ + +#include diff --git a/sys/arch/arm26/include/intr.h b/sys/arch/acorn26/include/intr.h similarity index 95% rename from sys/arch/arm26/include/intr.h rename to sys/arch/acorn26/include/intr.h index a926ea875659..16741f44cad3 100644 --- a/sys/arch/arm26/include/intr.h +++ b/sys/arch/acorn26/include/intr.h @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.10 2001/08/21 22:47:18 bjh21 Exp $ */ +/* $NetBSD: intr.h,v 1.1 2002/03/24 15:47:02 bjh21 Exp $ */ /*- * Copyright (c) 1998, 2000 Ben Harris * All rights reserved. @@ -74,15 +74,16 @@ #define splserial() raisespl(IPL_SERIAL) #define splclock() raisespl(IPL_CLOCK) #define splstatclock() raisespl(IPL_STATCLOCK) +#define splsched() raisespl(IPL_SCHED) -#define splsched() splhigh() +/* #define splsched() splhigh() */ #define spllock() splhigh() #define spl0() lowerspl(IPL_NONE) #define spllowersoftclock() lowerspl(IPL_SOFTCLOCK) #define splx(s) lowerspl(s) -extern int current_spl_level; /* XXX tautological name */ +extern int current_spl; /* XXX tautological name */ extern int splhigh(void); extern int raisespl(int); diff --git a/sys/arch/arm26/include/ipkdb.h b/sys/arch/acorn26/include/ipkdb.h similarity index 96% rename from sys/arch/arm26/include/ipkdb.h rename to sys/arch/acorn26/include/ipkdb.h index c349305477a9..c411e423f11f 100644 --- a/sys/arch/arm26/include/ipkdb.h +++ b/sys/arch/acorn26/include/ipkdb.h @@ -1,4 +1,4 @@ -/* $NetBSD: ipkdb.h,v 1.1 2000/05/09 21:55:59 bjh21 Exp $ */ +/* $NetBSD: ipkdb.h,v 1.1 2002/03/24 15:47:03 bjh21 Exp $ */ /* * Copyright (C) 1993, 1994 Wolfgang Solfrank. diff --git a/sys/arch/arm26/include/irq.h b/sys/arch/acorn26/include/irq.h similarity index 97% rename from sys/arch/arm26/include/irq.h rename to sys/arch/acorn26/include/irq.h index cf961300d001..9eeef1102ce5 100644 --- a/sys/arch/arm26/include/irq.h +++ b/sys/arch/acorn26/include/irq.h @@ -1,4 +1,4 @@ -/* $NetBSD: irq.h,v 1.8 2001/01/23 22:07:58 bjh21 Exp $ */ +/* $NetBSD: irq.h,v 1.1 2002/03/24 15:47:03 bjh21 Exp $ */ /*- * Copyright (c) 2000 Ben Harris * All rights reserved. @@ -29,7 +29,7 @@ #ifndef _ARM26_IRQ_H #define _ARM26_IRQ_H -#include +#include /* return values from interrupt handlers */ /* These are the same as arm32 uses */ diff --git a/sys/arch/acorn26/include/limits.h b/sys/arch/acorn26/include/limits.h new file mode 100644 index 000000000000..d713ecbfc16a --- /dev/null +++ b/sys/arch/acorn26/include/limits.h @@ -0,0 +1,3 @@ +/* $NetBSD: limits.h,v 1.1 2002/03/24 15:47:04 bjh21 Exp $ */ + +#include diff --git a/sys/arch/arm26/include/loadfile_machdep.h b/sys/arch/acorn26/include/loadfile_machdep.h similarity index 98% rename from sys/arch/arm26/include/loadfile_machdep.h rename to sys/arch/acorn26/include/loadfile_machdep.h index eec63b52952c..cac0129bfd0e 100644 --- a/sys/arch/arm26/include/loadfile_machdep.h +++ b/sys/arch/acorn26/include/loadfile_machdep.h @@ -1,4 +1,4 @@ -/* $NetBSD: loadfile_machdep.h,v 1.2 2001/10/31 17:59:38 bjh21 Exp $ */ +/* $NetBSD: loadfile_machdep.h,v 1.1 2002/03/24 15:47:04 bjh21 Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. diff --git a/sys/arch/acorn26/include/lock.h b/sys/arch/acorn26/include/lock.h new file mode 100644 index 000000000000..d42516e7ef51 --- /dev/null +++ b/sys/arch/acorn26/include/lock.h @@ -0,0 +1,3 @@ +/* $NetBSD: lock.h,v 1.1 2002/03/24 15:47:05 bjh21 Exp $ */ + +#include diff --git a/sys/arch/arm26/include/machdep.h b/sys/arch/acorn26/include/machdep.h similarity index 97% rename from sys/arch/arm26/include/machdep.h rename to sys/arch/acorn26/include/machdep.h index 17388deed8c3..1e4230173d87 100644 --- a/sys/arch/arm26/include/machdep.h +++ b/sys/arch/acorn26/include/machdep.h @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.h,v 1.5 2001/12/21 22:56:18 bjh21 Exp $ */ +/* $NetBSD: machdep.h,v 1.1 2002/03/24 15:47:05 bjh21 Exp $ */ /*- * Copyright (c) 1998 Ben Harris * All rights reserved. diff --git a/sys/arch/acorn26/include/math.h b/sys/arch/acorn26/include/math.h new file mode 100644 index 000000000000..b96ca7367cad --- /dev/null +++ b/sys/arch/acorn26/include/math.h @@ -0,0 +1,3 @@ +/* $NetBSD: math.h,v 1.1 2002/03/24 15:47:05 bjh21 Exp $ */ + +#include diff --git a/sys/arch/arm26/include/memcreg.h b/sys/arch/acorn26/include/memcreg.h similarity index 99% rename from sys/arch/arm26/include/memcreg.h rename to sys/arch/acorn26/include/memcreg.h index 512edbb34338..f39b71cb6fad 100644 --- a/sys/arch/arm26/include/memcreg.h +++ b/sys/arch/acorn26/include/memcreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: memcreg.h,v 1.3 2001/03/28 13:04:57 bjh21 Exp $ */ +/* $NetBSD: memcreg.h,v 1.1 2002/03/24 15:47:06 bjh21 Exp $ */ /*- * Copyright (c) 1997, 1998 Ben Harris * All rights reserved. diff --git a/sys/arch/arm26/include/param.h b/sys/arch/acorn26/include/param.h similarity index 96% rename from sys/arch/arm26/include/param.h rename to sys/arch/acorn26/include/param.h index 1a06e84a0a5f..d4d682a2d6b7 100644 --- a/sys/arch/arm26/include/param.h +++ b/sys/arch/acorn26/include/param.h @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.15 2002/02/26 15:13:21 simonb Exp $ */ +/* $NetBSD: param.h,v 1.1 2002/03/24 15:47:06 bjh21 Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -40,8 +40,8 @@ #include /* XXX for spl(9) */ #endif -#define _MACHINE arm26 -#define MACHINE "arm26" +#define _MACHINE acorn26 +#define MACHINE "acorn26" #define POOL_SUBPAGE 4096 diff --git a/sys/arch/acorn26/include/pcb.h b/sys/arch/acorn26/include/pcb.h new file mode 100644 index 000000000000..7f90f48c5b03 --- /dev/null +++ b/sys/arch/acorn26/include/pcb.h @@ -0,0 +1,3 @@ +/* $NetBSD: pcb.h,v 1.1 2002/03/24 15:47:07 bjh21 Exp $ */ + +#include diff --git a/sys/arch/arm26/include/pmap.h b/sys/arch/acorn26/include/pmap.h similarity index 97% rename from sys/arch/arm26/include/pmap.h rename to sys/arch/acorn26/include/pmap.h index 3976a508ad1e..66c1ee90357c 100644 --- a/sys/arch/arm26/include/pmap.h +++ b/sys/arch/acorn26/include/pmap.h @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.5 2001/05/05 14:20:06 bjh21 Exp $ */ +/* $NetBSD: pmap.h,v 1.1 2002/03/24 15:47:07 bjh21 Exp $ */ /*- * Copyright (c) 1997, 1998 Ben Harris * All rights reserved. diff --git a/sys/arch/arm26/include/podulebus_machdep.h b/sys/arch/acorn26/include/podulebus_machdep.h similarity index 98% rename from sys/arch/arm26/include/podulebus_machdep.h rename to sys/arch/acorn26/include/podulebus_machdep.h index 5c4d91ce11af..f8244e7757e4 100644 --- a/sys/arch/arm26/include/podulebus_machdep.h +++ b/sys/arch/acorn26/include/podulebus_machdep.h @@ -1,4 +1,4 @@ -/* $NetBSD: podulebus_machdep.h,v 1.4 2001/07/04 13:58:04 bjh21 Exp $ */ +/* $NetBSD: podulebus_machdep.h,v 1.1 2002/03/24 15:47:08 bjh21 Exp $ */ /* * Copyright (c) 1995 Mark Brinicombe. diff --git a/sys/arch/arm26/include/proc.h b/sys/arch/acorn26/include/proc.h similarity index 96% rename from sys/arch/arm26/include/proc.h rename to sys/arch/acorn26/include/proc.h index 6c86b2c7fec9..788536dbc03a 100644 --- a/sys/arch/arm26/include/proc.h +++ b/sys/arch/acorn26/include/proc.h @@ -1,4 +1,4 @@ -/* $NetBSD: proc.h,v 1.2 2001/02/17 20:07:01 bjh21 Exp $ */ +/* $NetBSD: proc.h,v 1.1 2002/03/24 15:47:08 bjh21 Exp $ */ /*- * Copyright (c) 1998 Ben Harris * All rights reserved. diff --git a/sys/arch/acorn26/include/profile.h b/sys/arch/acorn26/include/profile.h new file mode 100644 index 000000000000..8bf30f5e87b2 --- /dev/null +++ b/sys/arch/acorn26/include/profile.h @@ -0,0 +1,3 @@ +/* $NetBSD: profile.h,v 1.1 2002/03/24 15:47:08 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/ptrace.h b/sys/arch/acorn26/include/ptrace.h new file mode 100644 index 000000000000..95c6d8ff85e5 --- /dev/null +++ b/sys/arch/acorn26/include/ptrace.h @@ -0,0 +1,3 @@ +/* $NetBSD: ptrace.h,v 1.1 2002/03/24 15:47:09 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/reg.h b/sys/arch/acorn26/include/reg.h new file mode 100644 index 000000000000..bd3065ce9425 --- /dev/null +++ b/sys/arch/acorn26/include/reg.h @@ -0,0 +1,3 @@ +/* $NetBSD: reg.h,v 1.1 2002/03/24 15:47:09 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/setjmp.h b/sys/arch/acorn26/include/setjmp.h new file mode 100644 index 000000000000..ffd389f72f7b --- /dev/null +++ b/sys/arch/acorn26/include/setjmp.h @@ -0,0 +1,3 @@ +/* $NetBSD: setjmp.h,v 1.1 2002/03/24 15:47:10 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/signal.h b/sys/arch/acorn26/include/signal.h new file mode 100644 index 000000000000..f41714b33b3a --- /dev/null +++ b/sys/arch/acorn26/include/signal.h @@ -0,0 +1,3 @@ +/* $NetBSD: signal.h,v 1.1 2002/03/24 15:47:10 bjh21 Exp $ */ + +#include diff --git a/sys/arch/arm26/include/softintr.h b/sys/arch/acorn26/include/softintr.h similarity index 96% rename from sys/arch/arm26/include/softintr.h rename to sys/arch/acorn26/include/softintr.h index f5ce12e41559..360d9366fc81 100644 --- a/sys/arch/arm26/include/softintr.h +++ b/sys/arch/acorn26/include/softintr.h @@ -1,4 +1,4 @@ -/* $NetBSD: softintr.h,v 1.1 2000/05/09 21:56:00 bjh21 Exp $ */ +/* $NetBSD: softintr.h,v 1.1 2002/03/24 15:47:10 bjh21 Exp $ */ /*- * Copyright (c) 1999 Ben Harris * All rights reserved. diff --git a/sys/arch/acorn26/include/stdarg.h b/sys/arch/acorn26/include/stdarg.h new file mode 100644 index 000000000000..c6ac62cb0448 --- /dev/null +++ b/sys/arch/acorn26/include/stdarg.h @@ -0,0 +1,3 @@ +/* $NetBSD: stdarg.h,v 1.1 2002/03/24 15:47:11 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/sysarch.h b/sys/arch/acorn26/include/sysarch.h new file mode 100644 index 000000000000..c3728226e02e --- /dev/null +++ b/sys/arch/acorn26/include/sysarch.h @@ -0,0 +1,4 @@ +/* $NetBSD: sysarch.h,v 1.1 2002/03/24 15:47:11 bjh21 Exp $ */ + +#include + diff --git a/sys/arch/acorn26/include/trap.h b/sys/arch/acorn26/include/trap.h new file mode 100644 index 000000000000..9d96107bac5a --- /dev/null +++ b/sys/arch/acorn26/include/trap.h @@ -0,0 +1,3 @@ +/* $NetBSD: trap.h,v 1.1 2002/03/24 15:47:11 bjh21 Exp $ */ + +#include diff --git a/sys/arch/acorn26/include/types.h b/sys/arch/acorn26/include/types.h new file mode 100644 index 000000000000..b7d386efb6a6 --- /dev/null +++ b/sys/arch/acorn26/include/types.h @@ -0,0 +1,10 @@ +/* $NetBSD: types.h,v 1.1 2002/03/24 15:47:12 bjh21 Exp $ */ + +#ifndef _ACORN26_TYPES_H_ +#define _ACORN26_TYPES_H_ + +#include + +#define __HAVE_GENERIC_SOFT_INTERRUPTS + +#endif /* _ACORN26_TYPES_H_ */ diff --git a/sys/arch/acorn26/include/varargs.h b/sys/arch/acorn26/include/varargs.h new file mode 100644 index 000000000000..7d0dd60f612a --- /dev/null +++ b/sys/arch/acorn26/include/varargs.h @@ -0,0 +1,3 @@ +/* $NetBSD: varargs.h,v 1.1 2002/03/24 15:47:12 bjh21 Exp $ */ + +#include diff --git a/sys/arch/arm26/include/vmparam.h b/sys/arch/acorn26/include/vmparam.h similarity index 98% rename from sys/arch/arm26/include/vmparam.h rename to sys/arch/acorn26/include/vmparam.h index 69ad1cbf0059..7326c91b9a12 100644 --- a/sys/arch/arm26/include/vmparam.h +++ b/sys/arch/acorn26/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.6 2001/11/15 18:06:12 soren Exp $ */ +/* $NetBSD: vmparam.h,v 1.1 2002/03/24 15:47:12 bjh21 Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. diff --git a/sys/arch/arm26/iobus/iobus.c b/sys/arch/acorn26/iobus/iobus.c similarity index 95% rename from sys/arch/arm26/iobus/iobus.c rename to sys/arch/acorn26/iobus/iobus.c index e08ed1ee4ffb..a42c124dec70 100644 --- a/sys/arch/arm26/iobus/iobus.c +++ b/sys/arch/acorn26/iobus/iobus.c @@ -1,4 +1,4 @@ -/* $NetBSD: iobus.c,v 1.5 2001/03/20 00:03:10 bjh21 Exp $ */ +/* $NetBSD: iobus.c,v 1.1 2002/03/24 15:47:13 bjh21 Exp $ */ /*- * Copyright (c) 1998 Ben Harris * All rights reserved. @@ -32,7 +32,7 @@ #include -__RCSID("$NetBSD: iobus.c,v 1.5 2001/03/20 00:03:10 bjh21 Exp $"); +__RCSID("$NetBSD: iobus.c,v 1.1 2002/03/24 15:47:13 bjh21 Exp $"); #include #include @@ -40,7 +40,7 @@ __RCSID("$NetBSD: iobus.c,v 1.5 2001/03/20 00:03:10 bjh21 Exp $"); #include #include -#include +#include #include "locators.h" diff --git a/sys/arch/arm26/iobus/iobusvar.h b/sys/arch/acorn26/iobus/iobusvar.h similarity index 96% rename from sys/arch/arm26/iobus/iobusvar.h rename to sys/arch/acorn26/iobus/iobusvar.h index e9034c9c07ec..cb58628670c1 100644 --- a/sys/arch/arm26/iobus/iobusvar.h +++ b/sys/arch/acorn26/iobus/iobusvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: iobusvar.h,v 1.1 2000/05/09 21:56:01 bjh21 Exp $ */ +/* $NetBSD: iobusvar.h,v 1.1 2002/03/24 15:47:13 bjh21 Exp $ */ /*- * Copyright (c) 1998 Ben Harris * All rights reserved. diff --git a/sys/arch/arm26/iobus/ioc.c b/sys/arch/acorn26/iobus/ioc.c similarity index 90% rename from sys/arch/arm26/iobus/ioc.c rename to sys/arch/acorn26/iobus/ioc.c index 52863398db1b..b9c376edacb1 100644 --- a/sys/arch/arm26/iobus/ioc.c +++ b/sys/arch/acorn26/iobus/ioc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ioc.c,v 1.14 2001/08/25 17:59:38 bjh21 Exp $ */ +/* $NetBSD: ioc.c,v 1.1 2002/03/24 15:47:13 bjh21 Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 Ben Harris @@ -33,7 +33,7 @@ #include -__RCSID("$NetBSD: ioc.c,v 1.14 2001/08/25 17:59:38 bjh21 Exp $"); +__RCSID("$NetBSD: ioc.c,v 1.1 2002/03/24 15:47:13 bjh21 Exp $"); #include #include @@ -45,10 +45,10 @@ __RCSID("$NetBSD: ioc.c,v 1.14 2001/08/25 17:59:38 bjh21 Exp $"); #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "locators.h" @@ -59,17 +59,6 @@ static int ioc_print(void *aux, const char *pnp); static int ioc_irq_clock(void *cookie); static int ioc_irq_statclock(void *cookie); -struct ioc_softc { - struct device sc_dev; - bus_space_tag_t sc_bst; - bus_space_handle_t sc_bsh; - struct irq_handler *sc_clkirq; - struct evcnt sc_clkev; - struct irq_handler *sc_sclkirq; - struct evcnt sc_sclkev; - u_int8_t sc_ctl; -}; - struct cfattach ioc_ca = { sizeof(struct ioc_softc), ioc_match, ioc_attach }; @@ -182,43 +171,6 @@ ioc_print(void *aux, const char *pnp) return UNCONF; } -/* - * Control Register - */ - -/* - * ioc_ctl_{read,write} - * - * Functions to manipulate the IOC control register. The bottom six - * bits of the control register map to bidirectional pins on the chip. - * The output circuits are open-drain, so a pin is made an input by - * writing '1' to it. - */ - -u_int -ioc_ctl_read(struct device *self) -{ - struct ioc_softc *sc = (void *)self; - - return bus_space_read_1(sc->sc_bst, sc->sc_bsh, IOC_CTL); -} - -void -ioc_ctl_write(struct device *self, u_int value, u_int mask) -{ - struct ioc_softc *sc = (void *)self; - int s; - bus_space_tag_t bst = sc->sc_bst; - bus_space_handle_t bsh = sc->sc_bsh; - - s = splhigh(); - sc->sc_ctl = (sc->sc_ctl & ~mask) | (value & mask); - bus_space_barrier(bst, bsh, IOC_CTL, 1, BUS_BARRIER_WRITE); - bus_space_write_1(bst, bsh, IOC_CTL, sc->sc_ctl); - bus_space_barrier(bst, bsh, IOC_CTL, 1, BUS_BARRIER_WRITE); - splx(s); -} - /* * Find out if an interrupt line is currently active */ diff --git a/sys/arch/arm26/iobus/iocreg.h b/sys/arch/acorn26/iobus/iocreg.h similarity index 99% rename from sys/arch/arm26/iobus/iocreg.h rename to sys/arch/acorn26/iobus/iocreg.h index 058454c645fb..662f5dd5025f 100644 --- a/sys/arch/arm26/iobus/iocreg.h +++ b/sys/arch/acorn26/iobus/iocreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: iocreg.h,v 1.2 2002/03/07 23:16:44 bjh21 Exp $ */ +/* $NetBSD: iocreg.h,v 1.1 2002/03/24 15:47:13 bjh21 Exp $ */ /* * Copyright (c) 1997 Ben Harris. diff --git a/sys/arch/arm26/iobus/iocvar.h b/sys/arch/acorn26/iobus/iocvar.h similarity index 68% rename from sys/arch/arm26/iobus/iocvar.h rename to sys/arch/acorn26/iobus/iocvar.h index 8e159fce7230..85961ab4b784 100644 --- a/sys/arch/arm26/iobus/iocvar.h +++ b/sys/arch/acorn26/iobus/iocvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: iocvar.h,v 1.5 2001/08/20 23:08:11 bjh21 Exp $ */ +/* $NetBSD: iocvar.h,v 1.1 2002/03/24 15:47:14 bjh21 Exp $ */ /*- * Copyright (c) 1998, 1999 Ben Harris * All rights reserved. @@ -51,12 +51,21 @@ struct ioc_attach_args { int ioc_offset; }; +struct ioc_softc { + struct device sc_dev; + bus_space_tag_t sc_bst; + bus_space_handle_t sc_bsh; + struct irq_handler *sc_clkirq; + struct evcnt sc_clkev; + struct irq_handler *sc_sclkirq; + struct evcnt sc_sclkev; + u_int8_t sc_ctl; +}; + extern struct device *the_ioc; /* Public IOC functions */ -extern u_int ioc_ctl_read(struct device *); -extern void ioc_ctl_write(struct device *, u_int, u_int); extern int ioc_irq_status(int); extern void ioc_irq_waitfor(int); @@ -72,4 +81,41 @@ extern void ioc_initclocks(struct device *); extern void ioc_setstatclockrate(struct device *, int); extern void ioc_microtime(struct device *, struct timeval *); +/* + * Control Register + */ + +/* + * ioc_ctl_{read,write} + * + * Functions to manipulate the IOC control register. The bottom six + * bits of the control register map to bidirectional pins on the chip. + * The output circuits are open-drain, so a pin is made an input by + * writing '1' to it. + */ + +static inline u_int +ioc_ctl_read(struct device *self) +{ + struct ioc_softc *sc = (void *)self; + + return bus_space_read_1(sc->sc_bst, sc->sc_bsh, IOC_CTL); +} + +static inline void +ioc_ctl_write(struct device *self, u_int value, u_int mask) +{ + struct ioc_softc *sc = (void *)self; + int s; + bus_space_tag_t bst = sc->sc_bst; + bus_space_handle_t bsh = sc->sc_bsh; + + s = splhigh(); + sc->sc_ctl = (sc->sc_ctl & ~mask) | (value & mask); + bus_space_barrier(bst, bsh, IOC_CTL, 1, BUS_BARRIER_WRITE); + bus_space_write_1(bst, bsh, IOC_CTL, sc->sc_ctl); + bus_space_barrier(bst, bsh, IOC_CTL, 1, BUS_BARRIER_WRITE); + splx(s); +} + #endif diff --git a/sys/arch/arm26/iobus/upc_iobus.c b/sys/arch/acorn26/iobus/upc_iobus.c similarity index 94% rename from sys/arch/arm26/iobus/upc_iobus.c rename to sys/arch/acorn26/iobus/upc_iobus.c index ee785f4e786d..4b7cdd98406b 100644 --- a/sys/arch/arm26/iobus/upc_iobus.c +++ b/sys/arch/acorn26/iobus/upc_iobus.c @@ -1,4 +1,4 @@ -/* $NetBSD: upc_iobus.c,v 1.7 2001/03/20 00:04:28 bjh21 Exp $ */ +/* $NetBSD: upc_iobus.c,v 1.1 2002/03/24 15:47:14 bjh21 Exp $ */ /*- * Copyright (c) 2000 Ben Harris * All rights reserved. @@ -32,13 +32,13 @@ #include -__RCSID("$NetBSD: upc_iobus.c,v 1.7 2001/03/20 00:04:28 bjh21 Exp $"); +__RCSID("$NetBSD: upc_iobus.c,v 1.1 2002/03/24 15:47:14 bjh21 Exp $"); #include -#include +#include -#include +#include #include #include @@ -47,7 +47,7 @@ __RCSID("$NetBSD: upc_iobus.c,v 1.7 2001/03/20 00:04:28 bjh21 Exp $"); #include "ioeb.h" #if NIOEB > 0 -#include +#include #endif static int upc_iobus_match(struct device *, struct cfdata *, void *); diff --git a/sys/arch/arm26/ioc/arckbd.c b/sys/arch/acorn26/ioc/arckbd.c similarity index 98% rename from sys/arch/arm26/ioc/arckbd.c rename to sys/arch/acorn26/ioc/arckbd.c index 33dbb91011a1..021d4de66227 100644 --- a/sys/arch/arm26/ioc/arckbd.c +++ b/sys/arch/acorn26/ioc/arckbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: arckbd.c,v 1.17 2002/03/17 19:40:34 atatat Exp $ */ +/* $NetBSD: arckbd.c,v 1.1 2002/03/24 15:47:14 bjh21 Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 Ben Harris * All rights reserved. @@ -43,7 +43,7 @@ #include -__RCSID("$NetBSD: arckbd.c,v 1.17 2002/03/17 19:40:34 atatat Exp $"); +__RCSID("$NetBSD: arckbd.c,v 1.1 2002/03/24 15:47:14 bjh21 Exp $"); #include #include @@ -63,10 +63,10 @@ __RCSID("$NetBSD: arckbd.c,v 1.17 2002/03/17 19:40:34 atatat Exp $"); #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "arckbd.h" #include "locators.h" diff --git a/sys/arch/arm26/ioc/arckbdmap.c b/sys/arch/acorn26/ioc/arckbdmap.c similarity index 97% rename from sys/arch/arm26/ioc/arckbdmap.c rename to sys/arch/acorn26/ioc/arckbdmap.c index f3058ea924df..d981af4a60ab 100644 --- a/sys/arch/arm26/ioc/arckbdmap.c +++ b/sys/arch/acorn26/ioc/arckbdmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: arckbdmap.c,v 1.3 2000/05/13 14:40:11 bjh21 Exp $ */ +/* $NetBSD: arckbdmap.c,v 1.1 2002/03/24 15:47:15 bjh21 Exp $ */ /*- * Copyright (c) 1998 Ben Harris * All rights reserved. @@ -32,13 +32,13 @@ #include -__RCSID("$NetBSD: arckbdmap.c,v 1.3 2000/05/13 14:40:11 bjh21 Exp $"); +__RCSID("$NetBSD: arckbdmap.c,v 1.1 2002/03/24 15:47:15 bjh21 Exp $"); #include #include #include -#include -#include +#include +#include #define KC(n) (0xe000 | (n)) /* see wsksymdef.h */ diff --git a/sys/arch/arm26/ioc/arckbdreg.h b/sys/arch/acorn26/ioc/arckbdreg.h similarity index 98% rename from sys/arch/arm26/ioc/arckbdreg.h rename to sys/arch/acorn26/ioc/arckbdreg.h index 025354302fb7..47f097959057 100644 --- a/sys/arch/arm26/ioc/arckbdreg.h +++ b/sys/arch/acorn26/ioc/arckbdreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: arckbdreg.h,v 1.1 2000/05/09 21:56:02 bjh21 Exp $ */ +/* $NetBSD: arckbdreg.h,v 1.1 2002/03/24 15:47:15 bjh21 Exp $ */ /*- * Copyright (c) 1997, 1998 Ben Harris * All rights reserved. diff --git a/sys/arch/arm26/ioc/arckbdvar.h b/sys/arch/acorn26/ioc/arckbdvar.h similarity index 96% rename from sys/arch/arm26/ioc/arckbdvar.h rename to sys/arch/acorn26/ioc/arckbdvar.h index fb8ee4e34c80..f80c2cb93ab6 100644 --- a/sys/arch/arm26/ioc/arckbdvar.h +++ b/sys/arch/acorn26/ioc/arckbdvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: arckbdvar.h,v 1.1 2000/05/09 21:56:02 bjh21 Exp $ */ +/* $NetBSD: arckbdvar.h,v 1.1 2002/03/24 15:47:15 bjh21 Exp $ */ /*- * Copyright (c) 1998 Ben Harris * All rights reserved. diff --git a/sys/arch/arm26/ioc/arcpp.c b/sys/arch/acorn26/ioc/arcpp.c similarity index 94% rename from sys/arch/arm26/ioc/arcpp.c rename to sys/arch/acorn26/ioc/arcpp.c index 215335038a0f..fd6aa5759bb1 100644 --- a/sys/arch/arm26/ioc/arcpp.c +++ b/sys/arch/acorn26/ioc/arcpp.c @@ -1,4 +1,4 @@ -/* $NetBSD: arcpp.c,v 1.1 2001/04/22 15:01:25 bjh21 Exp $ */ +/* $NetBSD: arcpp.c,v 1.1 2002/03/24 15:47:15 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -52,7 +52,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.1 2001/04/22 15:01:25 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.1 2002/03/24 15:47:15 bjh21 Exp $"); #include #include @@ -65,11 +65,11 @@ __KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.1 2001/04/22 15:01:25 bjh21 Exp $"); #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "ioeb.h" @@ -113,7 +113,6 @@ static int arcpp_match(struct device *, struct cfdata *, void *); static void arcpp_attach(struct device *, struct device *, void *); static int arcppintr(void *); -static void arcppwakeup(void *); static int arcpppushbytes(struct arcpp_softc *); struct cfattach arcpp_ca = { @@ -173,7 +172,7 @@ arcppopen(dev_t dev, int flag, int mode, struct proc *p) struct arcpp_softc *sc; bus_space_tag_t iot; bus_space_handle_t ioh; - int error; + int error, s; sc = device_lookup(&arcpp_cd, ARCPPUNIT(dev)); if (sc == NULL) @@ -193,6 +192,7 @@ arcppopen(dev_t dev, int flag, int mode, struct proc *p) iot = sc->sc_iot; ioh = sc->sc_ioh; + s = spllpt(); /* wait till ready (printer running diagnostics) */ irq_enable(sc->sc_bih); /* XXX Is it really appropriate to time out? */ @@ -211,20 +211,10 @@ arcppopen(dev_t dev, int flag, int mode, struct proc *p) sc->sc_state = ARCPP_OPEN; - arcppwakeup(sc); - - return 0; -} - -static void -arcppwakeup(void *arg) -{ - struct arcpp_softc *sc = arg; - int s; - - s = spllpt(); arcppintr(sc); splx(s); + + return 0; } /* diff --git a/sys/arch/arm26/ioc/arcppreg.h b/sys/arch/acorn26/ioc/arcppreg.h similarity index 73% rename from sys/arch/arm26/ioc/arcppreg.h rename to sys/arch/acorn26/ioc/arcppreg.h index b2d8a46ae378..f0464b4e7736 100644 --- a/sys/arch/arm26/ioc/arcppreg.h +++ b/sys/arch/acorn26/ioc/arcppreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: arcppreg.h,v 1.1 2001/04/22 15:01:25 bjh21 Exp $ */ +/* $NetBSD: arcppreg.h,v 1.1 2002/03/24 15:47:16 bjh21 Exp $ */ /* * This file is in the public domain. diff --git a/sys/arch/arm26/ioc/if_eca.c b/sys/arch/acorn26/ioc/if_eca.c similarity index 98% rename from sys/arch/arm26/ioc/if_eca.c rename to sys/arch/acorn26/ioc/if_eca.c index ccc04d8fbb08..d5a34fb820a1 100644 --- a/sys/arch/arm26/ioc/if_eca.c +++ b/sys/arch/acorn26/ioc/if_eca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_eca.c,v 1.11 2001/12/20 01:20:25 thorpej Exp $ */ +/* $NetBSD: if_eca.c,v 1.1 2002/03/24 15:47:16 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -29,7 +29,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: if_eca.c,v 1.11 2001/12/20 01:20:25 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_eca.c,v 1.1 2002/03/24 15:47:16 bjh21 Exp $"); #include #include @@ -46,10 +46,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_eca.c,v 1.11 2001/12/20 01:20:25 thorpej Exp $"); #include #include -#include +#include #include -#include +#include static int eca_match(struct device *, struct cfdata *, void *); static void eca_attach(struct device *, struct device *, void *); diff --git a/sys/arch/arm26/ioc/if_eca_fiq.S b/sys/arch/acorn26/ioc/if_eca_fiq.S similarity index 97% rename from sys/arch/arm26/ioc/if_eca_fiq.S rename to sys/arch/acorn26/ioc/if_eca_fiq.S index f3e694a3a31c..0b88b1bc7e09 100644 --- a/sys/arch/arm26/ioc/if_eca_fiq.S +++ b/sys/arch/acorn26/ioc/if_eca_fiq.S @@ -1,4 +1,4 @@ -/* $NetBSD: if_eca_fiq.S,v 1.4 2001/11/07 19:52:59 bjh21 Exp $ */ +/* $NetBSD: if_eca_fiq.S,v 1.1 2002/03/24 15:47:16 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -29,7 +29,7 @@ #include -RCSID("$NetBSD: if_eca_fiq.S,v 1.4 2001/11/07 19:52:59 bjh21 Exp $") +RCSID("$NetBSD: if_eca_fiq.S,v 1.1 2002/03/24 15:47:16 bjh21 Exp $") #include #include diff --git a/sys/arch/arm26/ioc/if_ecavar.h b/sys/arch/acorn26/ioc/if_ecavar.h similarity index 97% rename from sys/arch/arm26/ioc/if_ecavar.h rename to sys/arch/acorn26/ioc/if_ecavar.h index 04775eb41c74..9056122d22f8 100644 --- a/sys/arch/arm26/ioc/if_ecavar.h +++ b/sys/arch/acorn26/ioc/if_ecavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_ecavar.h,v 1.4 2001/12/20 01:20:25 thorpej Exp $ */ +/* $NetBSD: if_ecavar.h,v 1.1 2002/03/24 15:47:16 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris diff --git a/sys/arch/arm26/ioc/iic.c b/sys/arch/acorn26/ioc/iic.c similarity index 97% rename from sys/arch/arm26/ioc/iic.c rename to sys/arch/acorn26/ioc/iic.c index 6a9aa8b72fa2..f5ecd17ff49a 100644 --- a/sys/arch/arm26/ioc/iic.c +++ b/sys/arch/acorn26/ioc/iic.c @@ -1,4 +1,4 @@ -/* $NetBSD: iic.c,v 1.3 2001/01/23 23:58:32 bjh21 Exp $ */ +/* $NetBSD: iic.c,v 1.1 2002/03/24 15:47:17 bjh21 Exp $ */ /* * Copyright (c) 1994-1996 Mark Brinicombe. @@ -47,7 +47,7 @@ #include -__RCSID("$NetBSD: iic.c,v 1.3 2001/01/23 23:58:32 bjh21 Exp $"); +__RCSID("$NetBSD: iic.c,v 1.1 2002/03/24 15:47:17 bjh21 Exp $"); #include #include @@ -57,9 +57,9 @@ __RCSID("$NetBSD: iic.c,v 1.3 2001/01/23 23:58:32 bjh21 Exp $"); #include #include -#include -#include -#include +#include +#include +#include #include "locators.h" diff --git a/sys/arch/arm26/ioc/iic.h b/sys/arch/acorn26/ioc/iic.h similarity index 97% rename from sys/arch/arm26/ioc/iic.h rename to sys/arch/acorn26/ioc/iic.h index 1bea797e0fa4..7de26efc940c 100644 --- a/sys/arch/arm26/ioc/iic.h +++ b/sys/arch/acorn26/ioc/iic.h @@ -1,4 +1,4 @@ -/* $NetBSD: iic.h,v 1.1 2000/05/09 21:56:02 bjh21 Exp $ */ +/* $NetBSD: iic.h,v 1.1 2002/03/24 15:47:17 bjh21 Exp $ */ /* * Copyright (c) 1996 Mark Brinicombe. diff --git a/sys/arch/arm26/ioc/ioc_fiq_util.S b/sys/arch/acorn26/ioc/ioc_fiq_util.S similarity index 91% rename from sys/arch/arm26/ioc/ioc_fiq_util.S rename to sys/arch/acorn26/ioc/ioc_fiq_util.S index 1b3ee29b8fdf..3596d4c9c3d6 100644 --- a/sys/arch/arm26/ioc/ioc_fiq_util.S +++ b/sys/arch/acorn26/ioc/ioc_fiq_util.S @@ -1,4 +1,4 @@ -/* $NetBSD: ioc_fiq_util.S,v 1.1 2001/12/20 01:20:25 thorpej Exp $ */ +/* $NetBSD: ioc_fiq_util.S,v 1.1 2002/03/24 15:47:18 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -29,10 +29,10 @@ #include -RCSID("$NetBSD: ioc_fiq_util.S,v 1.1 2001/12/20 01:20:25 thorpej Exp $") +RCSID("$NetBSD: ioc_fiq_util.S,v 1.1 2002/03/24 15:47:18 bjh21 Exp $") #include -#include +#include /* * fiq_downgrade should be called in FIQ mode. It uses R12_fiq and R13_fiq diff --git a/sys/arch/arm26/ioc/ioeb.c b/sys/arch/acorn26/ioc/ioeb.c similarity index 92% rename from sys/arch/arm26/ioc/ioeb.c rename to sys/arch/acorn26/ioc/ioeb.c index 4e1b975d2afb..632e18786262 100644 --- a/sys/arch/arm26/ioc/ioeb.c +++ b/sys/arch/acorn26/ioc/ioeb.c @@ -1,4 +1,4 @@ -/* $NetBSD: ioeb.c,v 1.5 2001/02/08 22:21:24 bjh21 Exp $ */ +/* $NetBSD: ioeb.c,v 1.1 2002/03/24 15:47:18 bjh21 Exp $ */ /*- * Copyright (c) 2000 Ben Harris @@ -30,16 +30,16 @@ #include -__KERNEL_RCSID(0, "$NetBSD: ioeb.c,v 1.5 2001/02/08 22:21:24 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ioeb.c,v 1.1 2002/03/24 15:47:18 bjh21 Exp $"); #include #include #include -#include -#include -#include +#include +#include +#include struct ioeb_softc { struct device sc_dev; diff --git a/sys/arch/arm26/ioc/ioebreg.h b/sys/arch/acorn26/ioc/ioebreg.h similarity index 94% rename from sys/arch/arm26/ioc/ioebreg.h rename to sys/arch/acorn26/ioc/ioebreg.h index 75c29db13132..679264ece365 100644 --- a/sys/arch/arm26/ioc/ioebreg.h +++ b/sys/arch/acorn26/ioc/ioebreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ioebreg.h,v 1.1 2000/05/09 21:56:02 bjh21 Exp $ */ +/* $NetBSD: ioebreg.h,v 1.1 2002/03/24 15:47:19 bjh21 Exp $ */ /* * This file is in the public domain. diff --git a/sys/arch/arm26/ioc/ioebvar.h b/sys/arch/acorn26/ioc/ioebvar.h similarity index 96% rename from sys/arch/arm26/ioc/ioebvar.h rename to sys/arch/acorn26/ioc/ioebvar.h index 28d930c1289f..5498dbac43b6 100644 --- a/sys/arch/arm26/ioc/ioebvar.h +++ b/sys/arch/acorn26/ioc/ioebvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ioebvar.h,v 1.3 2001/02/08 22:21:25 bjh21 Exp $ */ +/* $NetBSD: ioebvar.h,v 1.1 2002/03/24 15:47:19 bjh21 Exp $ */ /*- * Copyright (c) 2000 Ben Harris diff --git a/sys/arch/arm26/ioc/latches.c b/sys/arch/acorn26/ioc/latches.c similarity index 92% rename from sys/arch/arm26/ioc/latches.c rename to sys/arch/acorn26/ioc/latches.c index a6ad63270d90..4222c2f56a25 100644 --- a/sys/arch/arm26/ioc/latches.c +++ b/sys/arch/acorn26/ioc/latches.c @@ -1,4 +1,4 @@ -/* $NetBSD: latches.c,v 1.2 2001/04/22 15:00:13 bjh21 Exp $ */ +/* $NetBSD: latches.c,v 1.1 2002/03/24 15:47:20 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -29,17 +29,17 @@ #include -__KERNEL_RCSID(0, "$NetBSD: latches.c,v 1.2 2001/04/22 15:00:13 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: latches.c,v 1.1 2002/03/24 15:47:20 bjh21 Exp $"); #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "ioeb.h" diff --git a/sys/arch/arm26/ioc/latchreg.h b/sys/arch/acorn26/ioc/latchreg.h similarity index 97% rename from sys/arch/arm26/ioc/latchreg.h rename to sys/arch/acorn26/ioc/latchreg.h index a5a478c65e53..47e33d4d9a27 100644 --- a/sys/arch/arm26/ioc/latchreg.h +++ b/sys/arch/acorn26/ioc/latchreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: latchreg.h,v 1.2 2001/04/22 00:26:36 bjh21 Exp $ */ +/* $NetBSD: latchreg.h,v 1.1 2002/03/24 15:47:20 bjh21 Exp $ */ /*- * Copyright (c) 1997, 1998, 2001 Ben Harris * All rights reserved. diff --git a/sys/arch/arm26/ioc/latchvar.h b/sys/arch/acorn26/ioc/latchvar.h similarity index 96% rename from sys/arch/arm26/ioc/latchvar.h rename to sys/arch/acorn26/ioc/latchvar.h index 4d383a08d8f1..ab2b9cc56ba3 100644 --- a/sys/arch/arm26/ioc/latchvar.h +++ b/sys/arch/acorn26/ioc/latchvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: latchvar.h,v 1.2 2001/04/22 15:00:13 bjh21 Exp $ */ +/* $NetBSD: latchvar.h,v 1.1 2002/03/24 15:47:21 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris diff --git a/sys/arch/arm26/ioc/pcf8583reg.h b/sys/arch/acorn26/ioc/pcf8583reg.h similarity index 97% rename from sys/arch/arm26/ioc/pcf8583reg.h rename to sys/arch/acorn26/ioc/pcf8583reg.h index 552753eba9bd..2f757f2402b0 100644 --- a/sys/arch/arm26/ioc/pcf8583reg.h +++ b/sys/arch/acorn26/ioc/pcf8583reg.h @@ -1,4 +1,4 @@ -/* $NetBSD: pcf8583reg.h,v 1.1 2000/05/09 21:56:02 bjh21 Exp $ */ +/* $NetBSD: pcf8583reg.h,v 1.1 2002/03/24 15:47:21 bjh21 Exp $ */ /* * Ben Harris, 2000 diff --git a/sys/arch/arm26/ioc/rtc.c b/sys/arch/acorn26/ioc/rtc.c similarity index 97% rename from sys/arch/arm26/ioc/rtc.c rename to sys/arch/acorn26/ioc/rtc.c index 192b0fad8b8b..cc4626bfcf20 100644 --- a/sys/arch/arm26/ioc/rtc.c +++ b/sys/arch/acorn26/ioc/rtc.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtc.c,v 1.6 2001/08/26 12:24:25 bjh21 Exp $ */ +/* $NetBSD: rtc.c,v 1.1 2002/03/24 15:47:21 bjh21 Exp $ */ /* * Copyright (c) 2000 Ben Harris @@ -45,7 +45,7 @@ #include -__RCSID("$NetBSD: rtc.c,v 1.6 2001/08/26 12:24:25 bjh21 Exp $"); +__RCSID("$NetBSD: rtc.c,v 1.1 2002/03/24 15:47:21 bjh21 Exp $"); #include #include @@ -58,8 +58,8 @@ __RCSID("$NetBSD: rtc.c,v 1.6 2001/08/26 12:24:25 bjh21 Exp $"); #include -#include -#include +#include +#include struct rtc_softc { struct device sc_dev; diff --git a/sys/arch/acorn26/ioc/ssn.c b/sys/arch/acorn26/ioc/ssn.c new file mode 100644 index 000000000000..51078e76fa72 --- /dev/null +++ b/sys/arch/acorn26/ioc/ssn.c @@ -0,0 +1,184 @@ +/* $NetBSD: ssn.c,v 1.1 2002/03/24 15:47:22 bjh21 Exp $ */ + +/*- + * Copyright (c) 2002 Ben Harris + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +__RCSID("$NetBSD: ssn.c,v 1.1 2002/03/24 15:47:22 bjh21 Exp $"); + +#include +#include + +#include + +#include +#include + +#include + +struct ssn_softc { + struct device sc_dev; + struct ds_handle sc_dsh; + struct device *sc_ioc; + int sc_timebase; +}; + +static int ssn_match(struct device *, struct cfdata *, void *); +static void ssn_attach(struct device *, struct device *, void *); + +struct cfattach ssn_ca = { + sizeof(struct ssn_softc), ssn_match, ssn_attach +}; + +static int ds_ioc_read_bit(void *); +static void ds_ioc_write_bit(void *, int); +static void ds_ioc_reset(void *); + +static int ds_crc(const u_int8_t *data, size_t len); + +static int +ssn_match(struct device *parent, struct cfdata *cf, void *aux) +{ + + return (1); +} + +static void +ssn_attach(struct device *parent, struct device *self, void *aux) +{ + struct ssn_softc *sc = (void *)self; + int i; + u_int8_t rombuf[8]; + + sc->sc_ioc = parent; + sc->sc_dsh.ds_read_bit = ds_ioc_read_bit; + sc->sc_dsh.ds_write_bit = ds_ioc_write_bit; + sc->sc_dsh.ds_reset = ds_ioc_reset; + sc->sc_dsh.ds_hw_handle = sc; + + sc->sc_dsh.ds_reset(sc->sc_dsh.ds_hw_handle); + + ds_write_byte(&sc->sc_dsh, DS_ROM_READ); + for (i=0; i<8; ++i) + rombuf[i] = ds_read_byte(&sc->sc_dsh); + + printf(": ROM %02x %02x%02x%02x%02x%02x%02x %02x CRC %02x\n", + rombuf[7], rombuf[6], rombuf[5], rombuf[4], + rombuf[3], rombuf[2], rombuf[1], rombuf[0], ds_crc(rombuf, 8)); + +} + +static int +ds_ioc_read_bit(void *cookie) +{ + struct ssn_softc *sc = cookie; + int result; + + /* + * Read is 1--15us low, >60us high. + * Sample 15us after falling edge. + */ + ioc_ctl_write(sc->sc_ioc, 0, IOC_CTL_SSN); + ioc_ctl_write(sc->sc_ioc, IOC_CTL_SSN, IOC_CTL_SSN); + result = (ioc_ctl_read(sc->sc_ioc) & IOC_CTL_SSN) != 0; + DELAY(60); + return result; +} + +static void +ds_ioc_write_bit(void *cookie, int bit) +{ + struct ssn_softc *sc = cookie; + + if (!bit) { + /* Write 0 is 60--120us low, >1us high. */ + ioc_ctl_write(sc->sc_ioc, 0, IOC_CTL_SSN); + DELAY(60); + ioc_ctl_write(sc->sc_ioc, IOC_CTL_SSN, IOC_CTL_SSN); + DELAY(1); + } else { + /* Write 1 is 1--15us low, >60us high. */ + ioc_ctl_write(sc->sc_ioc, 0, IOC_CTL_SSN); + ioc_ctl_write(sc->sc_ioc, IOC_CTL_SSN, IOC_CTL_SSN); + DELAY(60); + } +} + +static void +ds_ioc_reset(void *cookie) +{ + struct ssn_softc *sc = cookie; + int t_pdh, t_pdl; + + /* Reset pulse is >480us low, then >480us high. */ + ioc_ctl_write(sc->sc_ioc, 0, IOC_CTL_SSN); + DELAY(480); + ioc_ctl_write(sc->sc_ioc, IOC_CTL_SSN, IOC_CTL_SSN); + DELAY(60); + if ((ioc_ctl_read(sc->sc_ioc) & IOC_CTL_SSN) != 0) { + printf(": No presence pulse\n"); + return; + } + DELAY(420); + /* Reset again, and time it this time. */ + ioc_ctl_write(sc->sc_ioc, 0, IOC_CTL_SSN); + DELAY(480); + ioc_ctl_write(sc->sc_ioc, IOC_CTL_SSN, IOC_CTL_SSN); + t_pdh = 0; + while ((ioc_ctl_read(sc->sc_ioc) & IOC_CTL_SSN) != 0) + t_pdh++; + t_pdl = 0; + while ((ioc_ctl_read(sc->sc_ioc) & IOC_CTL_SSN) == 0) + t_pdl++; + DELAY(480); + printf(": t_PDH = %d, t_PDL = %d", t_pdh, t_pdl); + sc->sc_timebase = (t_pdh + t_pdl) / 5 + 1; +} + +#define DS_CRC_POLY 0x8c + +static int +ds_crc(const u_int8_t *buf, size_t len) +{ + u_int8_t c, crc, carry; + size_t i, j; + + crc = 0; + + for (i = 0; i < len; i++) { + c = buf[i]; + for (j = 0; j < 8; j++) { + carry = (crc ^ c) & 0x01; + crc >>= 1; + c >>= 1; + if (carry) + crc ^= DS_CRC_POLY; + } + } + return (crc); +} diff --git a/sys/arch/arm26/podulebus/if_eh.c b/sys/arch/acorn26/podulebus/if_eh.c similarity index 99% rename from sys/arch/arm26/podulebus/if_eh.c rename to sys/arch/acorn26/podulebus/if_eh.c index 8df06572d72e..30dcbed8072c 100644 --- a/sys/arch/arm26/podulebus/if_eh.c +++ b/sys/arch/acorn26/podulebus/if_eh.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_eh.c,v 1.20 2001/08/11 20:42:45 bjh21 Exp $ */ +/* $NetBSD: if_eh.c,v 1.1 2002/03/24 15:47:22 bjh21 Exp $ */ /*- * Copyright (c) 2000 Ben Harris @@ -53,7 +53,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: if_eh.c,v 1.20 2001/08/11 20:42:45 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_eh.c,v 1.1 2002/03/24 15:47:22 bjh21 Exp $"); #include #include @@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_eh.c,v 1.20 2001/08/11 20:42:45 bjh21 Exp $"); #include #include -#include +#include #if BYTE_ORDER == BIG_ENDIAN #include diff --git a/sys/arch/arm26/podulebus/if_ehreg.h b/sys/arch/acorn26/podulebus/if_ehreg.h similarity index 96% rename from sys/arch/arm26/podulebus/if_ehreg.h rename to sys/arch/acorn26/podulebus/if_ehreg.h index a87f8f584ccb..d09d821efd09 100644 --- a/sys/arch/arm26/podulebus/if_ehreg.h +++ b/sys/arch/acorn26/podulebus/if_ehreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_ehreg.h,v 1.5 2000/12/22 22:21:37 bjh21 Exp $ */ +/* $NetBSD: if_ehreg.h,v 1.1 2002/03/24 15:47:22 bjh21 Exp $ */ /* * This file is in the public domain diff --git a/sys/arch/arm26/podulebus/podloader_asm.S b/sys/arch/acorn26/podulebus/podloader_asm.S similarity index 94% rename from sys/arch/arm26/podulebus/podloader_asm.S rename to sys/arch/acorn26/podulebus/podloader_asm.S index 1b1b2492b942..b2d0d6dcfb31 100644 --- a/sys/arch/arm26/podulebus/podloader_asm.S +++ b/sys/arch/acorn26/podulebus/podloader_asm.S @@ -1,4 +1,4 @@ -/* $NetBSD: podloader_asm.S,v 1.3 2001/12/03 20:54:07 bjh21 Exp $ */ +/* $NetBSD: podloader_asm.S,v 1.1 2002/03/24 15:47:22 bjh21 Exp $ */ /*- * Copyright (c) 2000 Ben Harris @@ -30,7 +30,7 @@ #include -RCSID("$NetBSD: podloader_asm.S,v 1.3 2001/12/03 20:54:07 bjh21 Exp $") +RCSID("$NetBSD: podloader_asm.S,v 1.1 2002/03/24 15:47:22 bjh21 Exp $") #include diff --git a/sys/arch/arm26/podulebus/podulebus.c b/sys/arch/acorn26/podulebus/podulebus.c similarity index 97% rename from sys/arch/arm26/podulebus/podulebus.c rename to sys/arch/acorn26/podulebus/podulebus.c index f2d58103d040..8f7fa133c6d2 100644 --- a/sys/arch/arm26/podulebus/podulebus.c +++ b/sys/arch/acorn26/podulebus/podulebus.c @@ -1,4 +1,4 @@ -/* $NetBSD: podulebus.c,v 1.16 2001/12/03 20:54:07 bjh21 Exp $ */ +/* $NetBSD: podulebus.c,v 1.1 2002/03/24 15:47:23 bjh21 Exp $ */ /*- * Copyright (c) 2000 Ben Harris @@ -30,7 +30,7 @@ #include -__RCSID("$NetBSD: podulebus.c,v 1.16 2001/12/03 20:54:07 bjh21 Exp $"); +__RCSID("$NetBSD: podulebus.c,v 1.1 2002/03/24 15:47:23 bjh21 Exp $"); #include #include @@ -41,10 +41,10 @@ __RCSID("$NetBSD: podulebus.c,v 1.16 2001/12/03 20:54:07 bjh21 Exp $"); #include #include -#include -#include +#include +#include #include -#include +#include #include "locators.h" @@ -52,7 +52,7 @@ __RCSID("$NetBSD: podulebus.c,v 1.16 2001/12/03 20:54:07 bjh21 Exp $"); #include "unixbp.h" #if NUNIXBP > 0 -#include +#include #endif static int podulebus_match(struct device *, struct cfdata *, void *); diff --git a/sys/arch/arm26/podulebus/podulebusreg.h b/sys/arch/acorn26/podulebus/podulebusreg.h similarity index 95% rename from sys/arch/arm26/podulebus/podulebusreg.h rename to sys/arch/acorn26/podulebus/podulebusreg.h index 875035120b94..a1d5489b9e8c 100644 --- a/sys/arch/arm26/podulebus/podulebusreg.h +++ b/sys/arch/acorn26/podulebus/podulebusreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: podulebusreg.h,v 1.3 2001/06/11 19:07:14 bjh21 Exp $ */ +/* $NetBSD: podulebusreg.h,v 1.1 2002/03/24 15:47:23 bjh21 Exp $ */ /* * 2000 Ben Harris diff --git a/sys/arch/acorn26/podulebus/powerrom.c b/sys/arch/acorn26/podulebus/powerrom.c new file mode 100644 index 000000000000..3285583f6b95 --- /dev/null +++ b/sys/arch/acorn26/podulebus/powerrom.c @@ -0,0 +1,37 @@ +/* $NetBSD: powerrom.c,v 1.1 2002/03/24 15:47:23 bjh21 Exp $ */ + +/* Test driver to see if we can talk to PowerROMs */ + +#include + +__KERNEL_RCSID(0, "$NetBSD: powerrom.c,v 1.1 2002/03/24 15:47:23 bjh21 Exp $"); + +#include +#include +#include +#include + +int powerrom_match(struct device *, struct cfdata *, void *); +void powerrom_attach(struct device *, struct device *, void *); + +struct cfattach powerrom_ca = { + sizeof(struct device), powerrom_match, powerrom_attach +}; + +int +powerrom_match(struct device *parent, struct cfdata *cf, void *aux) +{ + struct podulebus_attach_args *pa = aux; + + return (pa->pa_product == PODULE_ALSYSTEMS_SCSI); +} + +void +powerrom_attach(struct device *parent, struct device *self, void *aux) +{ + struct podulebus_attach_args *pa = aux; + + if (podulebus_initloader(pa) == 0) + printf(": card id = 0x%x", podloader_callloader(pa, 0, 0)); + printf("\n"); +} diff --git a/sys/arch/arm26/podulebus/unixbp.c b/sys/arch/acorn26/podulebus/unixbp.c similarity index 92% rename from sys/arch/arm26/podulebus/unixbp.c rename to sys/arch/acorn26/podulebus/unixbp.c index 9fa1e7954bd5..91159a5a5f3d 100644 --- a/sys/arch/arm26/podulebus/unixbp.c +++ b/sys/arch/acorn26/podulebus/unixbp.c @@ -1,4 +1,4 @@ -/* $NetBSD: unixbp.c,v 1.4 2001/01/23 23:58:32 bjh21 Exp $ */ +/* $NetBSD: unixbp.c,v 1.1 2002/03/24 15:47:23 bjh21 Exp $ */ /*- * Copyright (c) 2000 Ben Harris @@ -33,14 +33,14 @@ #include -__KERNEL_RCSID(0, "$NetBSD: unixbp.c,v 1.4 2001/01/23 23:58:32 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: unixbp.c,v 1.1 2002/03/24 15:47:23 bjh21 Exp $"); #include #include #include -#include -#include -#include +#include +#include +#include struct unixbp_softc { struct device sc_dev; diff --git a/sys/arch/arm26/podulebus/unixbpreg.h b/sys/arch/acorn26/podulebus/unixbpreg.h similarity index 77% rename from sys/arch/arm26/podulebus/unixbpreg.h rename to sys/arch/acorn26/podulebus/unixbpreg.h index 16c077eae134..6d2a0b974ea9 100644 --- a/sys/arch/arm26/podulebus/unixbpreg.h +++ b/sys/arch/acorn26/podulebus/unixbpreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: unixbpreg.h,v 1.1 2000/05/09 21:56:04 bjh21 Exp $ */ +/* $NetBSD: unixbpreg.h,v 1.1 2002/03/24 15:47:23 bjh21 Exp $ */ /* * This file is in the public domain. diff --git a/sys/arch/arm26/podulebus/unixbpvar.h b/sys/arch/acorn26/podulebus/unixbpvar.h similarity index 96% rename from sys/arch/arm26/podulebus/unixbpvar.h rename to sys/arch/acorn26/podulebus/unixbpvar.h index dd212de20085..7ac69a940b01 100644 --- a/sys/arch/arm26/podulebus/unixbpvar.h +++ b/sys/arch/acorn26/podulebus/unixbpvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: unixbpvar.h,v 1.3 2001/01/23 23:58:32 bjh21 Exp $ */ +/* $NetBSD: unixbpvar.h,v 1.1 2002/03/24 15:47:24 bjh21 Exp $ */ /*- * Copyright (c) 2000 Ben Harris diff --git a/sys/arch/acorn26/stand/Makefile b/sys/arch/acorn26/stand/Makefile new file mode 100644 index 000000000000..7fd9757e0416 --- /dev/null +++ b/sys/arch/acorn26/stand/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2002/03/24 15:47:24 bjh21 Exp $ + +SUBDIR= boot26 + +.include diff --git a/sys/arch/arm26/stand/Makefile.buildboot b/sys/arch/acorn26/stand/Makefile.buildboot similarity index 93% rename from sys/arch/arm26/stand/Makefile.buildboot rename to sys/arch/acorn26/stand/Makefile.buildboot index f17d40fff3fe..3896bcd0faa1 100644 --- a/sys/arch/arm26/stand/Makefile.buildboot +++ b/sys/arch/acorn26/stand/Makefile.buildboot @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.buildboot,v 1.7 2001/12/12 01:49:37 tv Exp $ +# $NetBSD: Makefile.buildboot,v 1.1 2002/03/24 15:47:24 bjh21 Exp $ S?= ${.CURDIR}/../../../.. @@ -43,7 +43,7 @@ LIBSA= ${SALIB} ### find out what to use for libriscos RISCOS_AS= library -.include "${S}/arch/arm26/stand/lib/Makefile.inc" +.include "${S}/arch/acorn26/stand/lib/Makefile.inc" LIBRISCOS= ${RISCOSLIB} RELOC=8000 diff --git a/sys/arch/arm26/stand/boot26/Makefile b/sys/arch/acorn26/stand/boot26/Makefile similarity index 83% rename from sys/arch/arm26/stand/boot26/Makefile rename to sys/arch/acorn26/stand/boot26/Makefile index 2e43c677567e..fcd5a439fd06 100644 --- a/sys/arch/arm26/stand/boot26/Makefile +++ b/sys/arch/acorn26/stand/boot26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/08/02 23:55:55 bjh21 Exp $ +# $NetBSD: Makefile,v 1.1 2002/03/24 15:47:25 bjh21 Exp $ PROG= boot26 PROGSOURCE= rmheader.S rmvers.c srt0.S boot26.c start.S diff --git a/sys/arch/arm26/stand/boot26/boot26.c b/sys/arch/acorn26/stand/boot26/boot26.c similarity index 99% rename from sys/arch/arm26/stand/boot26/boot26.c rename to sys/arch/acorn26/stand/boot26/boot26.c index 3b7cdb01d2b0..1aaec2b39bf3 100644 --- a/sys/arch/arm26/stand/boot26/boot26.c +++ b/sys/arch/acorn26/stand/boot26/boot26.c @@ -1,4 +1,4 @@ -/* $NetBSD: boot26.c,v 1.2 2001/07/28 13:49:25 bjh21 Exp $ */ +/* $NetBSD: boot26.c,v 1.1 2002/03/24 15:47:25 bjh21 Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 Ben Harris diff --git a/sys/arch/arm26/stand/boot26/rmheader.S b/sys/arch/acorn26/stand/boot26/rmheader.S similarity index 97% rename from sys/arch/arm26/stand/boot26/rmheader.S rename to sys/arch/acorn26/stand/boot26/rmheader.S index 7651ed7eab15..18be57ad20f9 100644 --- a/sys/arch/arm26/stand/boot26/rmheader.S +++ b/sys/arch/acorn26/stand/boot26/rmheader.S @@ -1,4 +1,4 @@ -/* $NetBSD: rmheader.S,v 1.2 2001/08/03 00:40:23 bjh21 Exp $ */ +/* $NetBSD: rmheader.S,v 1.1 2002/03/24 15:47:25 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris diff --git a/sys/arch/arm26/stand/boot26/start.S b/sys/arch/acorn26/stand/boot26/start.S similarity index 96% rename from sys/arch/arm26/stand/boot26/start.S rename to sys/arch/acorn26/stand/boot26/start.S index 522d2a12ff2e..66c8f1e7200d 100644 --- a/sys/arch/arm26/stand/boot26/start.S +++ b/sys/arch/acorn26/stand/boot26/start.S @@ -1,4 +1,4 @@ -/* $NetBSD: start.S,v 1.2 2001/07/28 13:49:25 bjh21 Exp $ */ +/* $NetBSD: start.S,v 1.1 2002/03/24 15:47:25 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris diff --git a/sys/arch/arm26/stand/boot26/version b/sys/arch/acorn26/stand/boot26/version similarity index 83% rename from sys/arch/arm26/stand/boot26/version rename to sys/arch/acorn26/stand/boot26/version index 9c690adbb04b..394ac8c9af71 100644 --- a/sys/arch/arm26/stand/boot26/version +++ b/sys/arch/acorn26/stand/boot26/version @@ -1,4 +1,4 @@ - $NetBSD: version,v 1.6 2001/11/09 19:53:17 scw Exp $ + $NetBSD: version,v 1.1 2002/03/24 15:47:26 bjh21 Exp $ 0.90: Experimental C version 0.91: General cleanup diff --git a/sys/arch/arm26/stand/lib/Makefile b/sys/arch/acorn26/stand/lib/Makefile similarity index 89% rename from sys/arch/arm26/stand/lib/Makefile rename to sys/arch/acorn26/stand/lib/Makefile index 7164c3c1983f..64a0246132f9 100644 --- a/sys/arch/arm26/stand/lib/Makefile +++ b/sys/arch/acorn26/stand/lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/12/12 01:49:37 tv Exp $ +# $NetBSD: Makefile,v 1.1 2002/03/24 15:47:26 bjh21 Exp $ S?= ${.CURDIR}/../../../../ diff --git a/sys/arch/arm26/stand/lib/Makefile.inc b/sys/arch/acorn26/stand/lib/Makefile.inc similarity index 94% rename from sys/arch/arm26/stand/lib/Makefile.inc rename to sys/arch/acorn26/stand/lib/Makefile.inc index df949ac666a8..b78bb3814aa1 100644 --- a/sys/arch/arm26/stand/lib/Makefile.inc +++ b/sys/arch/acorn26/stand/lib/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2001/07/26 22:11:08 bjh21 Exp $ +# $NetBSD: Makefile.inc,v 1.1 2002/03/24 15:47:26 bjh21 Exp $ # # Configuration variables (default values are below): # @@ -16,7 +16,7 @@ # Default values: RISCOSDST?= ${.OBJDIR}/lib/riscos -RISCOSDIR= ${S}/arch/arm26/stand/lib +RISCOSDIR= ${S}/arch/acorn26/stand/lib RISCOSLIB= ${RISCOSDST}/libriscos.a RISCOSMAKE= \ diff --git a/sys/arch/arm26/stand/lib/devopen.c b/sys/arch/acorn26/stand/lib/devopen.c similarity index 96% rename from sys/arch/arm26/stand/lib/devopen.c rename to sys/arch/acorn26/stand/lib/devopen.c index bd0067594647..888f993f5c13 100644 --- a/sys/arch/arm26/stand/lib/devopen.c +++ b/sys/arch/acorn26/stand/lib/devopen.c @@ -1,4 +1,4 @@ -/* $NetBSD: devopen.c,v 1.1 2001/07/26 22:11:08 bjh21 Exp $ */ +/* $NetBSD: devopen.c,v 1.1 2002/03/24 15:47:26 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris diff --git a/sys/arch/arm26/stand/lib/newvers_rm.sh b/sys/arch/acorn26/stand/lib/newvers_rm.sh similarity index 97% rename from sys/arch/arm26/stand/lib/newvers_rm.sh rename to sys/arch/acorn26/stand/lib/newvers_rm.sh index 86f4eae83ba1..7d79571992a1 100644 --- a/sys/arch/arm26/stand/lib/newvers_rm.sh +++ b/sys/arch/acorn26/stand/lib/newvers_rm.sh @@ -1,6 +1,6 @@ #! /bin/sh - # -# $NetBSD: newvers_rm.sh,v 1.1 2001/08/02 23:47:07 bjh21 Exp $ +# $NetBSD: newvers_rm.sh,v 1.1 2002/03/24 15:47:27 bjh21 Exp $ # # Copyright (c) 2000 The NetBSD Foundation, Inc. # All rights reserved. diff --git a/sys/arch/arm26/stand/lib/riscoscalls.S b/sys/arch/acorn26/stand/lib/riscoscalls.S similarity index 94% rename from sys/arch/arm26/stand/lib/riscoscalls.S rename to sys/arch/acorn26/stand/lib/riscoscalls.S index e6744a105b90..4e99bc0004f0 100644 --- a/sys/arch/arm26/stand/lib/riscoscalls.S +++ b/sys/arch/acorn26/stand/lib/riscoscalls.S @@ -1,4 +1,4 @@ -/* $NetBSD: riscoscalls.S,v 1.7 2001/07/27 23:09:15 bjh21 Exp $ */ +/* $NetBSD: riscoscalls.S,v 1.1 2002/03/24 15:47:27 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -196,6 +196,18 @@ ENTRY(os_read_vdu_variables) swi OS_ReadVduVariables ldmdb fp, {fp, sp, pc} +ENTRY(xos_swi_number_from_string) + mov ip, sp + stmfd sp!, {fp, ip, lr, pc} + sub fp, ip, #4 + mov r2, r1 + mov r1, r0 + swi XOS_SWINumberFromString + ldmvsdb fp, {fp, sp, pc} + str r0, [r2] + mov r0, #0 + ldmdb fp, {fp, sp, pc} + ENTRY(os_read_mem_map_info) mov ip, sp stmfd sp!, {fp, ip, lr, pc} diff --git a/sys/arch/arm26/stand/lib/riscoscalls.h b/sys/arch/acorn26/stand/lib/riscoscalls.h similarity index 90% rename from sys/arch/arm26/stand/lib/riscoscalls.h rename to sys/arch/acorn26/stand/lib/riscoscalls.h index bae5c28f827d..a2945b1c9aea 100644 --- a/sys/arch/arm26/stand/lib/riscoscalls.h +++ b/sys/arch/acorn26/stand/lib/riscoscalls.h @@ -1,4 +1,4 @@ -/* $NetBSD: riscoscalls.h,v 1.6 2001/08/03 00:32:30 bjh21 Exp $ */ +/* $NetBSD: riscoscalls.h,v 1.1 2002/03/24 15:47:27 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -64,6 +64,8 @@ #define XOS_ServiceCall 0x020030 #define OS_ReadVduVariables 0x000031 #define XOS_ReadVduVariables 0x020031 +#define OS_SWINumberFromString 0x000039 +#define XOS_SWINumberFromString 0x020039 #define OS_ReadMemMapInfo 0x000051 #define XOS_ReadMemMapInfo 0x020051 #define OS_ReadMemMapEntries 0x000052 @@ -176,6 +178,8 @@ extern void service_pre_reset(void); #ifndef __ASSEMBLER__ extern void os_read_vdu_variables(const int *, int *); +extern os_error *xos_swi_number_from_string(char const *, int *); + extern void os_read_mem_map_info(int *, int *); struct os_mem_map_request { @@ -190,6 +194,30 @@ struct os_mem_map_request { extern void os_read_mem_map_entries(struct os_mem_map_request *); extern os_error xcache_control(u_int, u_int, u_int *); + +struct filecore_disc { + u_int8_t log2secsize; + u_int8_t secspertrack; + u_int8_t heads; + u_int8_t density; + u_int8_t idlen; + u_int8_t log2bpmp; + u_int8_t skew; + u_int8_t bootoption; + u_int8_t lowsector; + u_int8_t nzones; + u_int16_t zone_spare; + u_int32_t root; + u_int32_t disc_size; + u_int16_t disc_id; + char disc_name[10]; + u_int32_t disc_type; + u_int32_t disc_size_hi; + u_int8_t share_size; + u_int8_t big_flag; + u_int8_t reserved[22]; +}; + #endif /* RISC OS Error numbers */ diff --git a/sys/arch/arm26/stand/lib/riscoscons.c b/sys/arch/acorn26/stand/lib/riscoscons.c similarity index 96% rename from sys/arch/arm26/stand/lib/riscoscons.c rename to sys/arch/acorn26/stand/lib/riscoscons.c index 962a72857879..a9845f24b423 100644 --- a/sys/arch/arm26/stand/lib/riscoscons.c +++ b/sys/arch/acorn26/stand/lib/riscoscons.c @@ -1,4 +1,4 @@ -/* $NetBSD: riscoscons.c,v 1.1 2001/07/26 22:11:09 bjh21 Exp $ */ +/* $NetBSD: riscoscons.c,v 1.1 2002/03/24 15:47:27 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris diff --git a/sys/arch/acorn26/stand/lib/riscosdisk.c b/sys/arch/acorn26/stand/lib/riscosdisk.c new file mode 100644 index 000000000000..9e5497ebb808 --- /dev/null +++ b/sys/arch/acorn26/stand/lib/riscosdisk.c @@ -0,0 +1,69 @@ +/* $NetBSD: riscosdisk.c,v 1.1 2002/03/24 15:47:27 bjh21 Exp $ */ + +/*- + * Copyright (c) 2001 Ben Harris + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include + +#include + +struct riscosdisk { + int drive; + /* SWI numbers */ + int describe_disc; + int disc_op; +}; + +int +rodisk_open(struct open_file *f, ...) +{ + va_list ap; + char const *fsname; + int drive; + size_t buflen; + char *buf; + struct riscosdisk *rd; + + va_start(ap, f); + fsname = va_arg(ap, char const *); + drive = va_arg(ap, int); + va_end(ap); + + rd = (struct riscosdisk *) alloc(sizeof(*rd)); + + buflen = strlen(fsname) + 13; + buf = alloc(buflen); + sprintf(buf, "%s_DescribeDisc", fsname); + if (xos_swi_number_from_string(buf, &rd->describe_disc) != NULL) + return ENODEV; + sprintf(buf, "%s_DiscOp", fsname); + if (xos_swi_number_from_string(buf, &rd->disc_op) != NULL) + return ENODEV; + + + diff --git a/sys/arch/acorn26/stand/lib/riscosdisk.h b/sys/arch/acorn26/stand/lib/riscosdisk.h new file mode 100644 index 000000000000..15cdc8c5c57b --- /dev/null +++ b/sys/arch/acorn26/stand/lib/riscosdisk.h @@ -0,0 +1,33 @@ +/* $NetBSD: riscosdisk.h,v 1.1 2002/03/24 15:47:28 bjh21 Exp $ */ + +/*- + * Copyright (c) 2001 Ben Harris + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +int rodisk_strategy(void *, int, daddr_t, size_t, void *, size_t *); +int rodisk_open(struct open_file *, ...); +int rodisk_close(struct open_file *); +int rodisk_ioctl(struct open_file *, u_long, void *); diff --git a/sys/arch/arm26/stand/lib/riscoserrors.c b/sys/arch/acorn26/stand/lib/riscoserrors.c similarity index 96% rename from sys/arch/arm26/stand/lib/riscoserrors.c rename to sys/arch/acorn26/stand/lib/riscoserrors.c index 656e7124dd22..5aacbf2ce3f4 100644 --- a/sys/arch/arm26/stand/lib/riscoserrors.c +++ b/sys/arch/acorn26/stand/lib/riscoserrors.c @@ -1,4 +1,4 @@ -/* $NetBSD: riscoserrors.c,v 1.1 2001/07/26 22:11:09 bjh21 Exp $ */ +/* $NetBSD: riscoserrors.c,v 1.1 2002/03/24 15:47:28 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris diff --git a/sys/arch/arm26/stand/lib/riscosfile.c b/sys/arch/acorn26/stand/lib/riscosfile.c similarity index 98% rename from sys/arch/arm26/stand/lib/riscosfile.c rename to sys/arch/acorn26/stand/lib/riscosfile.c index b662677ca8a4..37786d1124ea 100644 --- a/sys/arch/arm26/stand/lib/riscosfile.c +++ b/sys/arch/acorn26/stand/lib/riscosfile.c @@ -1,4 +1,4 @@ -/* $NetBSD: riscosfile.c,v 1.2 2001/07/27 01:03:34 bjh21 Exp $ */ +/* $NetBSD: riscosfile.c,v 1.1 2002/03/24 15:47:28 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris diff --git a/sys/arch/arm26/stand/lib/riscosfile.h b/sys/arch/acorn26/stand/lib/riscosfile.h similarity index 96% rename from sys/arch/arm26/stand/lib/riscosfile.h rename to sys/arch/acorn26/stand/lib/riscosfile.h index 32777415345e..e18d3cab4eb0 100644 --- a/sys/arch/arm26/stand/lib/riscosfile.h +++ b/sys/arch/acorn26/stand/lib/riscosfile.h @@ -1,4 +1,4 @@ -/* $NetBSD: riscosfile.h,v 1.1 2001/07/26 22:11:09 bjh21 Exp $ */ +/* $NetBSD: riscosfile.h,v 1.1 2002/03/24 15:47:28 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris diff --git a/sys/arch/arm26/stand/lib/srt0.S b/sys/arch/acorn26/stand/lib/srt0.S similarity index 96% rename from sys/arch/arm26/stand/lib/srt0.S rename to sys/arch/acorn26/stand/lib/srt0.S index dcd98767c0dd..0cf44085dd5f 100644 --- a/sys/arch/arm26/stand/lib/srt0.S +++ b/sys/arch/acorn26/stand/lib/srt0.S @@ -1,4 +1,4 @@ -/* $NetBSD: srt0.S,v 1.1 2001/07/26 22:11:10 bjh21 Exp $ */ +/* $NetBSD: srt0.S,v 1.1 2002/03/24 15:47:28 bjh21 Exp $ */ /*- * Copyright (c) 2001 Ben Harris diff --git a/sys/arch/arm26/stand/lib/srt1.c b/sys/arch/acorn26/stand/lib/srt1.c similarity index 98% rename from sys/arch/arm26/stand/lib/srt1.c rename to sys/arch/acorn26/stand/lib/srt1.c index dcd03dadc82b..84246411f72e 100644 --- a/sys/arch/arm26/stand/lib/srt1.c +++ b/sys/arch/acorn26/stand/lib/srt1.c @@ -1,4 +1,4 @@ -/* $NetBSD: srt1.c,v 1.3 2001/07/27 20:48:20 bjh21 Exp $ */ +/* $NetBSD: srt1.c,v 1.1 2002/03/24 15:47:29 bjh21 Exp $ */ /* * Copyright (c) 2001 Ben Harris. diff --git a/sys/arch/arm26/vidc/arcvideo.c b/sys/arch/acorn26/vidc/arcvideo.c similarity index 97% rename from sys/arch/arm26/vidc/arcvideo.c rename to sys/arch/acorn26/vidc/arcvideo.c index 6141d0a5fbf2..0232d1892710 100644 --- a/sys/arch/arm26/vidc/arcvideo.c +++ b/sys/arch/acorn26/vidc/arcvideo.c @@ -1,4 +1,4 @@ -/* $NetBSD: arcvideo.c,v 1.20 2002/03/17 19:40:34 atatat Exp $ */ +/* $NetBSD: arcvideo.c,v 1.1 2002/03/24 15:47:29 bjh21 Exp $ */ /*- * Copyright (c) 1998, 2000 Ben Harris * All rights reserved. @@ -39,7 +39,7 @@ #include -__RCSID("$NetBSD: arcvideo.c,v 1.20 2002/03/17 19:40:34 atatat Exp $"); +__RCSID("$NetBSD: arcvideo.c,v 1.1 2002/03/24 15:47:29 bjh21 Exp $"); #include #include @@ -60,10 +60,10 @@ __RCSID("$NetBSD: arcvideo.c,v 1.20 2002/03/17 19:40:34 atatat Exp $"); #include #include -#include -#include -#include -#include +#include +#include +#include +#include static int arcvideo_match(struct device *parent, struct cfdata *cf, void *aux); static void arcvideo_attach(struct device *parent, struct device *self, diff --git a/sys/arch/arm26/vidc/arcvideovar.h b/sys/arch/acorn26/vidc/arcvideovar.h similarity index 96% rename from sys/arch/arm26/vidc/arcvideovar.h rename to sys/arch/acorn26/vidc/arcvideovar.h index f970a08dfa22..70e9cccf0b75 100644 --- a/sys/arch/arm26/vidc/arcvideovar.h +++ b/sys/arch/acorn26/vidc/arcvideovar.h @@ -1,4 +1,4 @@ -/* $NetBSD: arcvideovar.h,v 1.1 2000/05/09 21:56:04 bjh21 Exp $ */ +/* $NetBSD: arcvideovar.h,v 1.1 2002/03/24 15:47:29 bjh21 Exp $ */ /*- * Copyright (c) 1998 Ben Harris * All rights reserved. diff --git a/sys/arch/arm26/vidc/vidcreg.h b/sys/arch/acorn26/vidc/vidcreg.h similarity index 98% rename from sys/arch/arm26/vidc/vidcreg.h rename to sys/arch/acorn26/vidc/vidcreg.h index dd3d9ab3b05c..842bf56bdb80 100644 --- a/sys/arch/arm26/vidc/vidcreg.h +++ b/sys/arch/acorn26/vidc/vidcreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: vidcreg.h,v 1.2 2001/01/12 00:12:38 bjh21 Exp $ */ +/* $NetBSD: vidcreg.h,v 1.1 2002/03/24 15:47:30 bjh21 Exp $ */ /*- * Copyright (c) 1998, 2001 Ben Harris diff --git a/sys/arch/arm26/vidc/vidmodes.c b/sys/arch/acorn26/vidc/vidmodes.c similarity index 100% rename from sys/arch/arm26/vidc/vidmodes.c rename to sys/arch/acorn26/vidc/vidmodes.c diff --git a/sys/arch/arm26/Makefile b/sys/arch/arm26/Makefile deleted file mode 100644 index 0a9f531b69dd..000000000000 --- a/sys/arch/arm26/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2000/11/21 23:47:37 bjh21 Exp $ - -# Makefile for arm26 tags file and boot blocks - -TARM26= ../arm26/tags -SARM26= ../arm26/arm26/*.[ch] ../arm26/include/*.h \ - ../arm26/iobus/*.[ch] ../arm26/ioc/*.[ch] ../arm32/mainbus/*.[ch] \ - ../arm26/vidc/*.[ch] -AARM26= ../arm26/arm26/*.S ../arm26/iobus/*.S - -# Directories in which to place tags links -DARM26= arm26 include iobus ioc mainbus vidc - -.include "../../kern/Make.tags.inc" - -tags: TAGS - -ctags -wdtf ${TARM26} ${SARM26} ${COMM} - egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AARM26} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ - >> ${TARM26} - sort -o ${TARM26} ${TARM26} - -TAGS: - etags ${SARM26} ${COMM} ${AARM26} - -links: - -for i in ${DARM26}; do \ - cd $$i && rm -f tags; ln -s ../tags tags; done - - -SUBDIR= stand include - -.include diff --git a/sys/arch/arm26/conf/std.arm26 b/sys/arch/arm26/conf/std.arm26 deleted file mode 100644 index dbe9b66b033a..000000000000 --- a/sys/arch/arm26/conf/std.arm26 +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: std.arm26,v 1.2 2001/01/10 18:38:37 bjh21 Exp $ - -# Standard NetBSD/arm26 options - -machine arm26 arm - diff --git a/sys/arch/arm26/include/ansi.h b/sys/arch/arm26/include/ansi.h deleted file mode 100644 index fadfaacb0dec..000000000000 --- a/sys/arch/arm26/include/ansi.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: ansi.h,v 1.7 2001/01/11 22:07:53 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/aout_machdep.h b/sys/arch/arm26/include/aout_machdep.h deleted file mode 100644 index 7b1b1e073732..000000000000 --- a/sys/arch/arm26/include/aout_machdep.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: aout_machdep.h,v 1.3 2001/01/11 22:07:53 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/asm.h b/sys/arch/arm26/include/asm.h deleted file mode 100644 index 95b68608442c..000000000000 --- a/sys/arch/arm26/include/asm.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: asm.h,v 1.6 2001/01/11 22:07:53 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/bootconfig.h b/sys/arch/arm26/include/bootconfig.h deleted file mode 100644 index ce9ecf241362..000000000000 --- a/sys/arch/arm26/include/bootconfig.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: bootconfig.h,v 1.1 2001/05/13 13:46:24 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/bswap.h b/sys/arch/arm26/include/bswap.h deleted file mode 100644 index 764efcf6614e..000000000000 --- a/sys/arch/arm26/include/bswap.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: bswap.h,v 1.2 2001/01/11 22:07:53 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/cdefs.h b/sys/arch/arm26/include/cdefs.h deleted file mode 100644 index 43d3ea90d732..000000000000 --- a/sys/arch/arm26/include/cdefs.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: cdefs.h,v 1.3 2001/01/11 22:07:54 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/cpu.h b/sys/arch/arm26/include/cpu.h deleted file mode 100644 index c9c55a5466c0..000000000000 --- a/sys/arch/arm26/include/cpu.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: cpu.h,v 1.4 2001/02/28 00:17:40 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/disklabel.h b/sys/arch/arm26/include/disklabel.h deleted file mode 100644 index c682c5ebfc7a..000000000000 --- a/sys/arch/arm26/include/disklabel.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: disklabel.h,v 1.2 2001/01/11 22:07:54 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/elf_machdep.h b/sys/arch/arm26/include/elf_machdep.h deleted file mode 100644 index 730f8586acf9..000000000000 --- a/sys/arch/arm26/include/elf_machdep.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: elf_machdep.h,v 1.2 2001/01/11 22:28:06 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/endian.h b/sys/arch/arm26/include/endian.h deleted file mode 100644 index a6977570e0c4..000000000000 --- a/sys/arch/arm26/include/endian.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: endian.h,v 1.1 2000/05/09 21:55:59 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/endian_machdep.h b/sys/arch/arm26/include/endian_machdep.h deleted file mode 100644 index e7c9da176366..000000000000 --- a/sys/arch/arm26/include/endian_machdep.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: endian_machdep.h,v 1.2 2001/02/17 14:55:45 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/float.h b/sys/arch/arm26/include/float.h deleted file mode 100644 index 7a0ca67063a1..000000000000 --- a/sys/arch/arm26/include/float.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: float.h,v 1.4 2001/01/11 22:07:54 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/fp.h b/sys/arch/arm26/include/fp.h deleted file mode 100644 index f8304d5d8449..000000000000 --- a/sys/arch/arm26/include/fp.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: fp.h,v 1.2 2001/01/11 22:07:54 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/ieee.h b/sys/arch/arm26/include/ieee.h deleted file mode 100644 index cab945de12df..000000000000 --- a/sys/arch/arm26/include/ieee.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: ieee.h,v 1.2 2001/01/11 22:07:54 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/ieeefp.h b/sys/arch/arm26/include/ieeefp.h deleted file mode 100644 index 170808e2603a..000000000000 --- a/sys/arch/arm26/include/ieeefp.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: ieeefp.h,v 1.2 2001/01/11 22:07:54 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/int_const.h b/sys/arch/arm26/include/int_const.h deleted file mode 100644 index 534afca457a2..000000000000 --- a/sys/arch/arm26/include/int_const.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: int_const.h,v 1.1 2001/04/14 22:38:35 kleink Exp $ */ - -#include diff --git a/sys/arch/arm26/include/int_fmtio.h b/sys/arch/arm26/include/int_fmtio.h deleted file mode 100644 index 2b10c79f5797..000000000000 --- a/sys/arch/arm26/include/int_fmtio.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: int_fmtio.h,v 1.1 2001/04/15 17:13:07 kleink Exp $ */ - -#include diff --git a/sys/arch/arm26/include/int_limits.h b/sys/arch/arm26/include/int_limits.h deleted file mode 100644 index ebb623488831..000000000000 --- a/sys/arch/arm26/include/int_limits.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: int_limits.h,v 1.1 2001/04/15 15:29:04 kleink Exp $ */ - -#include diff --git a/sys/arch/arm26/include/int_mwgwtypes.h b/sys/arch/arm26/include/int_mwgwtypes.h deleted file mode 100644 index 41a247b7a020..000000000000 --- a/sys/arch/arm26/include/int_mwgwtypes.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: int_mwgwtypes.h,v 1.1 2001/04/14 12:19:51 kleink Exp $ */ - -#include diff --git a/sys/arch/arm26/include/int_types.h b/sys/arch/arm26/include/int_types.h deleted file mode 100644 index 6550237c43ae..000000000000 --- a/sys/arch/arm26/include/int_types.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: int_types.h,v 1.5 2001/01/11 22:07:55 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/limits.h b/sys/arch/arm26/include/limits.h deleted file mode 100644 index 2cd8914b25fa..000000000000 --- a/sys/arch/arm26/include/limits.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: limits.h,v 1.3 2001/01/11 22:07:55 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/lock.h b/sys/arch/arm26/include/lock.h deleted file mode 100644 index 36f6542bc3d4..000000000000 --- a/sys/arch/arm26/include/lock.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: lock.h,v 1.2 2001/01/11 22:07:55 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/math.h b/sys/arch/arm26/include/math.h deleted file mode 100644 index fa1fd64b5f8f..000000000000 --- a/sys/arch/arm26/include/math.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: math.h,v 1.2 2001/01/11 22:07:55 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/pcb.h b/sys/arch/arm26/include/pcb.h deleted file mode 100644 index af81194c6fa3..000000000000 --- a/sys/arch/arm26/include/pcb.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: pcb.h,v 1.6 2001/09/03 19:20:28 matt Exp $ */ - -#include diff --git a/sys/arch/arm26/include/profile.h b/sys/arch/arm26/include/profile.h deleted file mode 100644 index 0a46aeb960df..000000000000 --- a/sys/arch/arm26/include/profile.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: profile.h,v 1.6 2001/05/04 00:11:15 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/ptrace.h b/sys/arch/arm26/include/ptrace.h deleted file mode 100644 index de3ae5aaf4a3..000000000000 --- a/sys/arch/arm26/include/ptrace.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: ptrace.h,v 1.3 2001/02/11 17:03:06 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/reg.h b/sys/arch/arm26/include/reg.h deleted file mode 100644 index b99c9e21bb0c..000000000000 --- a/sys/arch/arm26/include/reg.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: reg.h,v 1.2 2001/02/11 14:51:57 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/setjmp.h b/sys/arch/arm26/include/setjmp.h deleted file mode 100644 index 6453c3488511..000000000000 --- a/sys/arch/arm26/include/setjmp.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: setjmp.h,v 1.3 2001/01/11 22:07:55 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/signal.h b/sys/arch/arm26/include/signal.h deleted file mode 100644 index da9b258561f6..000000000000 --- a/sys/arch/arm26/include/signal.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: signal.h,v 1.2 2001/01/16 00:29:45 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/stdarg.h b/sys/arch/arm26/include/stdarg.h deleted file mode 100644 index 5eaa22d2a112..000000000000 --- a/sys/arch/arm26/include/stdarg.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: stdarg.h,v 1.3 2001/01/11 22:07:55 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/sysarch.h b/sys/arch/arm26/include/sysarch.h deleted file mode 100644 index edfb999622c2..000000000000 --- a/sys/arch/arm26/include/sysarch.h +++ /dev/null @@ -1,4 +0,0 @@ -/* $NetBSD: sysarch.h,v 1.1 2001/07/28 19:14:00 bjh21 Exp $ */ - -#include - diff --git a/sys/arch/arm26/include/trap.h b/sys/arch/arm26/include/trap.h deleted file mode 100644 index 99b96fe138e1..000000000000 --- a/sys/arch/arm26/include/trap.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: trap.h,v 1.2 2001/01/11 22:07:55 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/include/types.h b/sys/arch/arm26/include/types.h deleted file mode 100644 index 4febf4597159..000000000000 --- a/sys/arch/arm26/include/types.h +++ /dev/null @@ -1,10 +0,0 @@ -/* $NetBSD: types.h,v 1.8 2001/11/22 18:00:00 thorpej Exp $ */ - -#ifndef _ARM26_TYPES_H_ -#define _ARM26_TYPES_H_ - -#include - -#define __HAVE_GENERIC_SOFT_INTERRUPTS - -#endif /* _ARM26_TYPES_H_ */ diff --git a/sys/arch/arm26/include/varargs.h b/sys/arch/arm26/include/varargs.h deleted file mode 100644 index d2787cde5d14..000000000000 --- a/sys/arch/arm26/include/varargs.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: varargs.h,v 1.3 2001/01/11 22:07:55 bjh21 Exp $ */ - -#include diff --git a/sys/arch/arm26/stand/Makefile b/sys/arch/arm26/stand/Makefile deleted file mode 100644 index aaebe61cb246..000000000000 --- a/sys/arch/arm26/stand/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile,v 1.4 2001/12/03 23:07:25 bjh21 Exp $ - -SUBDIR= boot26 - -.include