diff options
| author | skrll <skrll@NetBSD.org> | 2014-02-24 07:23:38 +0000 |
|---|---|---|
| committer | skrll <skrll@NetBSD.org> | 2014-02-24 07:23:38 +0000 |
| commit | fdfdea60039e22119d6175ace2b6a723ee392192 (patch) | |
| tree | 0b8fbbd0de8b406be893feeea7742fe4b5a5ff78 | |
| parent | aa7ed973041f950326f3b8d26dc3469e679685db (diff) | |
Rename NetBSD/hp700 to NetBSD/hppa.
Unfortunately our VCS isn't very helpful here.
| -rwxr-xr-x | build.sh | 6 | ||||
| -rw-r--r-- | distrib/cdrom/current.conf | 4 | ||||
| -rw-r--r-- | distrib/hppa/Makefile (renamed from distrib/hp700/Makefile) | 2 | ||||
| -rw-r--r-- | distrib/hppa/cdroms/Makefile (renamed from distrib/hp700/cdroms/Makefile) | 2 | ||||
| -rw-r--r-- | distrib/hppa/cdroms/Makefile.cdrom (renamed from distrib/hp700/cdroms/Makefile.cdrom) | 4 | ||||
| -rw-r--r-- | distrib/hppa/cdroms/installcd/Makefile (renamed from distrib/hp700/cdroms/installcd/Makefile) | 4 | ||||
| -rw-r--r-- | distrib/hppa/kernel/Makefile (renamed from distrib/hp700/kernel/Makefile) | 4 | ||||
| -rw-r--r-- | distrib/hppa/ramdisk/Makefile (renamed from distrib/hp700/ramdisk/Makefile) | 2 | ||||
| -rw-r--r-- | distrib/hppa/ramdisk/dot.profile (renamed from distrib/hp700/ramdisk/dot.profile) | 2 | ||||
| -rw-r--r-- | distrib/hppa/ramdisk/list (renamed from distrib/hp700/ramdisk/list) | 2 | ||||
| -rw-r--r-- | distrib/hppa/sysnbsd/Makefile (renamed from distrib/hp700/sysnbsd/Makefile) | 4 | ||||
| -rw-r--r-- | distrib/notes/Makefile | 4 | ||||
| -rw-r--r-- | distrib/notes/common/list-setsizes.sh | 2 | ||||
| -rw-r--r-- | distrib/notes/common/macros | 3 | ||||
| -rw-r--r-- | distrib/notes/common/main | 6 | ||||
| -rw-r--r-- | distrib/notes/common/netboot | 56 | ||||
| -rw-r--r-- | distrib/notes/common/postinstall | 4 | ||||
| -rw-r--r-- | distrib/notes/common/sysinst | 16 | ||||
| -rw-r--r-- | distrib/notes/hp700/legal | 2 | ||||
| -rw-r--r-- | distrib/notes/hppa/Makefile (renamed from distrib/notes/hp700/Makefile) | 2 | ||||
| -rw-r--r-- | distrib/notes/hppa/contents (renamed from distrib/notes/hp700/contents) | 2 | ||||
| -rw-r--r-- | distrib/notes/hppa/hardware (renamed from distrib/notes/hp700/hardware) | 6 | ||||
| -rw-r--r-- | distrib/notes/hppa/install (renamed from distrib/notes/hp700/install) | 2 | ||||
| -rw-r--r-- | distrib/notes/hppa/legal | 2 | ||||
| -rw-r--r-- | distrib/notes/hppa/prep (renamed from distrib/notes/hp700/prep) | 2 | ||||
| -rw-r--r-- | distrib/notes/hppa/upgrade (renamed from distrib/notes/hp700/upgrade) | 2 | ||||
| -rw-r--r-- | distrib/notes/hppa/xfer (renamed from distrib/notes/hp700/xfer) | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/base/md.hppa (renamed from distrib/sets/lists/base/md.hp700) | 2 | ||||
| -rw-r--r-- | distrib/sets/lists/base/mi | 14 | ||||
| -rw-r--r-- | distrib/sets/lists/comp/md.hp700 | 63 | ||||
| -rw-r--r-- | distrib/sets/lists/comp/md.hppa | 66 | ||||
| -rw-r--r-- | distrib/sets/lists/debug/md.hppa (renamed from distrib/sets/lists/debug/md.hp700) | 2 | ||||
| -rw-r--r-- | distrib/sets/lists/man/mi | 136 | ||||
| -rw-r--r-- | distrib/sets/lists/modules/md.hppa (renamed from distrib/sets/lists/modules/ad.hppa) | 2 | ||||
| -rw-r--r-- | distrib/utils/sysinst/Makefile | 4 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hp700/Makefile | 6 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hppa/Makefile | 6 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hppa/md.c (renamed from distrib/utils/sysinst/arch/hp700/md.c) | 6 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hppa/md.h (renamed from distrib/utils/sysinst/arch/hp700/md.h) | 4 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hppa/menus.md.en (renamed from distrib/utils/sysinst/arch/hp700/menus.md.en) | 4 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hppa/menus.md.es (renamed from distrib/utils/sysinst/arch/hp700/menus.md.es) | 4 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hppa/menus.md.fr (renamed from distrib/utils/sysinst/arch/hp700/menus.md.fr) | 4 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hppa/menus.md.pl (renamed from distrib/utils/sysinst/arch/hp700/menus.md.pl) | 4 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hppa/msg.md.de (renamed from distrib/utils/sysinst/arch/hp700/msg.md.de) | 4 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hppa/msg.md.en (renamed from distrib/utils/sysinst/arch/hp700/msg.md.en) | 4 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hppa/msg.md.es (renamed from distrib/utils/sysinst/arch/hp700/msg.md.es) | 4 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hppa/msg.md.fr (renamed from distrib/utils/sysinst/arch/hp700/msg.md.fr) | 4 | ||||
| -rw-r--r-- | distrib/utils/sysinst/arch/hppa/msg.md.pl (renamed from distrib/utils/sysinst/arch/hp700/msg.md.pl) | 4 | ||||
| -rw-r--r-- | doc/RESPONSIBLE | 4 | ||||
| -rw-r--r-- | etc/etc.hp700/sysctl.conf | 0 | ||||
| -rw-r--r-- | etc/etc.hppa/MAKEDEV.conf (renamed from etc/etc.hp700/MAKEDEV.conf) | 2 | ||||
| -rw-r--r-- | etc/etc.hppa/Makefile.inc (renamed from etc/etc.hp700/Makefile.inc) | 4 | ||||
| -rw-r--r-- | etc/etc.hppa/ttys (renamed from etc/etc.hp700/ttys) | 2 | ||||
| -rw-r--r-- | etc/mtree/NetBSD.dist.base | 14 | ||||
| -rw-r--r-- | external/bsd/mdocml/dist/arch.in | 1 | ||||
| -rw-r--r-- | external/mit/xorg/bin/xdm/config/Makefile | 4 | ||||
| -rw-r--r-- | gnu/dist/groff/tmac/doc-common | 2 | ||||
| -rw-r--r-- | gnu/dist/groff/tmac/groff_mdoc.man | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/send-pr/categories | 1 | ||||
| -rw-r--r-- | sbin/disklabel/main.c | 6 | ||||
| -rw-r--r-- | share/man/man0/intros | 2 | ||||
| -rw-r--r-- | share/man/man4/Makefile | 4 | ||||
| -rw-r--r-- | share/man/man4/ddb.4 | 18 | ||||
| -rw-r--r-- | share/man/man4/hil.4 | 4 | ||||
| -rw-r--r-- | share/man/man4/iee.4 | 8 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/Makefile (renamed from share/man/man4/man4.hp700/Makefile) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/asp.4 (renamed from share/man/man4/man4.hp700/asp.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/astro.4 (renamed from share/man/man4/man4.hp700/astro.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/cpu.4 (renamed from share/man/man4/man4.hp700/cpu.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/dino.4 (renamed from share/man/man4/man4.hp700/dino.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/elroy.4 (renamed from share/man/man4/man4.hp700/elroy.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/gsc.4 (renamed from share/man/man4/man4.hp700/gsc.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/gsckbc.4 (renamed from share/man/man4/man4.hp700/gsckbc.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/harmony.4 (renamed from share/man/man4/man4.hp700/harmony.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/intro.4 (renamed from share/man/man4/man4.hp700/intro.4) | 8 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/io.4 (renamed from share/man/man4/man4.hp700/io.4) | 6 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/lasi.4 (renamed from share/man/man4/man4.hp700/lasi.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/lcd.4 (renamed from share/man/man4/man4.hp700/lcd.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/mem.4 (renamed from share/man/man4/man4.hp700/mem.4) | 6 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/mongoose.4 (renamed from share/man/man4/man4.hp700/mongoose.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/pdc.4 (renamed from share/man/man4/man4.hp700/pdc.4) | 8 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/phantomas.4 (renamed from share/man/man4/man4.hp700/phantomas.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/ssio.4 (renamed from share/man/man4/man4.hp700/ssio.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/uturn.4 (renamed from share/man/man4/man4.hp700/uturn.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/wax.4 (renamed from share/man/man4/man4.hp700/wax.4) | 4 | ||||
| -rw-r--r-- | share/man/man4/oosiop.4 | 6 | ||||
| -rw-r--r-- | share/man/man4/osiop.4 | 4 | ||||
| -rw-r--r-- | share/man/man4/siop.4 | 4 | ||||
| -rw-r--r-- | share/man/man7/hier.7 | 6 | ||||
| -rw-r--r-- | share/man/man8/MAKEDEV.8 | 4 | ||||
| -rw-r--r-- | share/man/man8/Makefile | 8 | ||||
| -rw-r--r-- | share/man/man8/man8.hp700/Makefile | 6 | ||||
| -rw-r--r-- | share/man/man8/man8.hppa/Makefile | 6 | ||||
| -rw-r--r-- | share/man/man8/man8.hppa/boot.8 (renamed from share/man/man8/man8.hp700/boot.8) | 8 | ||||
| -rw-r--r-- | share/man/man8/man8.hppa/mkboot.8 (renamed from share/man/man8/man8.hp700/mkboot.8) | 4 | ||||
| -rw-r--r-- | share/mk/bsd.README | 4 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 8 | ||||
| -rw-r--r-- | sys/arch/README | 4 | ||||
| -rw-r--r-- | sys/arch/hp700/Makefile | 5 | ||||
| -rw-r--r-- | sys/arch/hp700/compile/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/conf/GENERIC.MP | 7 | ||||
| -rw-r--r-- | sys/arch/hp700/conf/files.hp700 | 280 | ||||
| -rw-r--r-- | sys/arch/hp700/hp700/machdep.h | 117 | ||||
| -rw-r--r-- | sys/arch/hp700/include/Makefile | 25 | ||||
| -rw-r--r-- | sys/arch/hp700/include/ansi.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/aout_machdep.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/asm.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/bswap.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/byte_swap.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/cdefs.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/cpufunc.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/db_machdep.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/elf_machdep.h | 7 | ||||
| -rw-r--r-- | sys/arch/hp700/include/endian.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/endian_machdep.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/exec.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/float.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/frame.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/ieee.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/ieeefp.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/int_const.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/int_fmtio.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/int_limits.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/int_mwgwtypes.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/int_types.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/kcore.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/limits.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/lock.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/math.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/mcontext.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/mutex.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/param.h | 39 | ||||
| -rw-r--r-- | sys/arch/hp700/include/pcb.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/pmap.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/pmc.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/proc.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/profile.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/psl.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/pte.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/ptrace.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/reg.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/reloc.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/rwlock.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/setjmp.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/signal.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/som.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/trap.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/types.h | 13 | ||||
| -rw-r--r-- | sys/arch/hp700/include/vmparam.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/include/wchar_limits.h | 3 | ||||
| -rw-r--r-- | sys/arch/hp700/stand/cdboot/version | 3 | ||||
| -rw-r--r-- | sys/arch/hppa/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/compile/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/GENERIC (renamed from sys/arch/hp700/conf/GENERIC) | 8 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/GENERIC.MP | 7 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/Makefile.hppa (renamed from sys/arch/hp700/conf/Makefile.hp700) | 17 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/RAMDISK (renamed from sys/arch/hp700/conf/RAMDISK) | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/files.hppa | 293 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/ld.script (renamed from sys/arch/hp700/conf/ld.script) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/majors.hppa (renamed from sys/arch/hp700/conf/majors.hp700) | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/std.hppa (renamed from sys/arch/hp700/conf/std.hp700) | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/Makefile (renamed from sys/arch/hp700/dev/Makefile) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/apic.c (renamed from sys/arch/hp700/dev/apic.c) | 10 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/asp.c (renamed from sys/arch/hp700/dev/asp.c) | 22 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/astro.c (renamed from sys/arch/hp700/dev/astro.c) | 10 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/clock.c (renamed from sys/arch/hp700/dev/clock.c) | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/com_dino.c (renamed from sys/arch/hp700/dev/com_dino.c) | 10 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/com_ssio.c (renamed from sys/arch/hp700/dev/com_ssio.c) | 12 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/cpu.c (renamed from sys/arch/hp700/dev/cpu.c) | 18 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/cpudevs (renamed from sys/arch/hp700/dev/cpudevs) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/cpudevs.h (renamed from sys/arch/hp700/dev/cpudevs.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/cpudevs_data.h (renamed from sys/arch/hp700/dev/cpudevs_data.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/devlist2h.awk (renamed from sys/arch/hp700/dev/devlist2h.awk) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/dino.c (renamed from sys/arch/hp700/dev/dino.c) | 22 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/elroy.c (renamed from sys/arch/hp700/dev/elroy.c) | 8 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/elroyreg.h (renamed from sys/arch/hp700/dev/elroyreg.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/elroyvar.h (renamed from sys/arch/hp700/dev/elroyvar.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/gecko.c (renamed from sys/arch/hp700/dev/gecko.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/lasi.c (renamed from sys/arch/hp700/dev/lasi.c) | 18 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/lcd.c (renamed from sys/arch/hp700/dev/lcd.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/lpt_ssio.c (renamed from sys/arch/hp700/dev/lpt_ssio.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/mem.c (renamed from sys/arch/hp700/dev/mem.c) | 18 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/mongoose.c (renamed from sys/arch/hp700/dev/mongoose.c) | 14 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/pdc.c (renamed from sys/arch/hp700/dev/pdc.c) | 20 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/phantomas.c (renamed from sys/arch/hp700/dev/phantomas.c) | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/power.c (renamed from sys/arch/hp700/dev/power.c) | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/siop_sgc.c (renamed from sys/arch/hp700/dev/siop_sgc.c) | 12 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/ssio.c (renamed from sys/arch/hp700/dev/ssio.c) | 10 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/ssiovar.h (renamed from sys/arch/hp700/dev/ssiovar.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/sti_pci_machdep.c (renamed from sys/arch/hp700/dev/sti_pci_machdep.c) | 8 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/sti_sgc.c (renamed from sys/arch/hp700/dev/sti_sgc.c) | 16 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/uturn.c (renamed from sys/arch/hp700/dev/uturn.c) | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/viper.h (renamed from sys/arch/hp700/dev/viper.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/wax.c (renamed from sys/arch/hp700/dev/wax.c) | 18 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/com_gsc.c (renamed from sys/arch/hp700/gsc/com_gsc.c) | 18 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/fdc_gsc.c (renamed from sys/arch/hp700/gsc/fdc_gsc.c) | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/gscbus.c (renamed from sys/arch/hp700/gsc/gscbus.c) | 10 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/gscbusvar.h (renamed from sys/arch/hp700/gsc/gscbusvar.h) | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/gsckbc.c (renamed from sys/arch/hp700/gsc/gsckbc.c) | 20 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/harmony.c (renamed from sys/arch/hp700/gsc/harmony.c) | 12 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/harmonyreg.h (renamed from sys/arch/hp700/gsc/harmonyreg.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/harmonyvar.h (renamed from sys/arch/hp700/gsc/harmonyvar.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/hil_gsc.c (renamed from sys/arch/hp700/gsc/hil_gsc.c) | 14 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/if_ie_gsc.c (renamed from sys/arch/hp700/gsc/if_ie_gsc.c) | 18 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/if_iee_gsc.c (renamed from sys/arch/hp700/gsc/if_iee_gsc.c) | 14 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/lpt_gsc.c (renamed from sys/arch/hp700/gsc/lpt_gsc.c) | 10 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/oosiop_gsc.c (renamed from sys/arch/hp700/gsc/oosiop_gsc.c) | 14 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/osiop_gsc.c (renamed from sys/arch/hp700/gsc/osiop_gsc.c) | 14 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/siop_gsc.c (renamed from sys/arch/hp700/gsc/siop_gsc.c) | 10 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/autoconf.c (renamed from sys/arch/hp700/hp700/autoconf.c) | 102 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/conf.c (renamed from sys/arch/hp700/hp700/conf.c) | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/disksubr.c (renamed from sys/arch/hp700/hp700/disksubr.c) | 28 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/genassym.cf (renamed from sys/arch/hp700/hp700/genassym.cf) | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/hppa_machdep.c | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/intr.c (renamed from sys/arch/hp700/hp700/intr.c) | 104 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/locore.S (renamed from sys/arch/hp700/hp700/locore.S) | 18 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/machdep.c (renamed from sys/arch/hp700/hp700/machdep.c) | 74 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/machdep.h | 47 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/mainbus.c (renamed from sys/arch/hp700/hp700/mainbus.c) | 36 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/pim.h (renamed from sys/arch/hp700/hp700/pim.h) | 48 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/sys_machdep.c (renamed from sys/arch/hp700/hp700/sys_machdep.c) | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/include/Makefile | 16 | ||||
| -rw-r--r-- | sys/arch/hppa/include/autoconf.h (renamed from sys/arch/hp700/include/autoconf.h) | 10 | ||||
| -rw-r--r-- | sys/arch/hppa/include/bootinfo.h (renamed from sys/arch/hp700/include/bootinfo.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/include/bus_defs.h (renamed from sys/arch/hp700/include/bus_defs.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/include/bus_funcs.h (renamed from sys/arch/hp700/include/bus_funcs.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/include/cpu.h (renamed from sys/arch/hp700/include/cpu.h) | 8 | ||||
| -rw-r--r-- | sys/arch/hppa/include/disklabel.h (renamed from sys/arch/hp700/include/disklabel.h) | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/include/eisa_machdep.h (renamed from sys/arch/hp700/include/eisa_machdep.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/include/endian.h | 3 | ||||
| -rw-r--r-- | sys/arch/hppa/include/hil_machdep.h (renamed from sys/arch/hp700/include/hil_machdep.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/include/intr.h (renamed from sys/arch/hp700/include/intr.h) | 46 | ||||
| -rw-r--r-- | sys/arch/hppa/include/intrdefs.h (renamed from sys/arch/hp700/include/intrdefs.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/include/iomod.h (renamed from sys/arch/hp700/include/iomod.h) | 8 | ||||
| -rw-r--r-- | sys/arch/hppa/include/isa_machdep.h (renamed from sys/arch/hp700/include/isa_machdep.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/include/loadfile_machdep.h (renamed from sys/arch/hp700/include/loadfile_machdep.h) | 8 | ||||
| -rw-r--r-- | sys/arch/hppa/include/nvm.h (renamed from sys/arch/hp700/include/nvm.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/include/param.h | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/include/pci_machdep.h (renamed from sys/arch/hp700/include/pci_machdep.h) | 0 | ||||
| -rw-r--r-- | sys/arch/hppa/include/pdc.h (renamed from sys/arch/hp700/include/pdc.h) | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/include/types.h | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/Makefile (renamed from sys/arch/hp700/stand/Makefile) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/Makefile.buildboot (renamed from sys/arch/hp700/stand/Makefile.buildboot) | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/Makefile.inc (renamed from sys/arch/hp700/stand/Makefile.inc) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/boot/Makefile (renamed from sys/arch/hp700/stand/boot/Makefile) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/boot/boot.c (renamed from sys/arch/hp700/stand/boot/boot.c) | 12 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/boot/bootinfo.c (renamed from sys/arch/hp700/stand/boot/bootinfo.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/boot/bootinfo.h (renamed from sys/arch/hp700/stand/boot/bootinfo.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/boot/conf.c (renamed from sys/arch/hp700/stand/boot/conf.c) | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/boot/ld.script (renamed from sys/arch/hp700/stand/boot/ld.script) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/boot/tgets.c (renamed from sys/arch/hp700/stand/boot/tgets.c) | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/boot/version (renamed from sys/arch/hp700/stand/boot/version) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/cdboot/Makefile (renamed from sys/arch/hp700/stand/cdboot/Makefile) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/cdboot/cdboot.c (renamed from sys/arch/hp700/stand/cdboot/cdboot.c) | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/cdboot/conf.c (renamed from sys/arch/hp700/stand/cdboot/conf.c) | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/cdboot/ld.script (renamed from sys/arch/hp700/stand/cdboot/ld.script) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/cdboot/version | 3 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/cons.c (renamed from sys/arch/hp700/stand/common/cons.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/ct.c (renamed from sys/arch/hp700/stand/common/ct.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/dev_hppa.c (renamed from sys/arch/hp700/stand/common/dev_hppa.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/dev_hppa.h (renamed from sys/arch/hp700/stand/common/dev_hppa.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/dk.c (renamed from sys/arch/hp700/stand/common/dk.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/exec_hppa.c (renamed from sys/arch/hp700/stand/common/exec_hppa.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/exec_som.c (renamed from sys/arch/hp700/stand/common/exec_som.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/itecons.c (renamed from sys/arch/hp700/stand/common/itecons.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/lf.c (renamed from sys/arch/hp700/stand/common/lf.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/libsa.h (renamed from sys/arch/hp700/stand/common/libsa.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/lif.c (renamed from sys/arch/hp700/stand/common/lif.c) | 28 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/machdep.c (renamed from sys/arch/hp700/stand/common/machdep.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/milli_tiny.S (renamed from sys/arch/hp700/stand/common/milli_tiny.S) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/pdc.c (renamed from sys/arch/hp700/stand/common/pdc.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/srt0.S (renamed from sys/arch/hp700/stand/common/srt0.S) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/common/time.c (renamed from sys/arch/hp700/stand/common/time.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/mkboot/Makefile (renamed from sys/arch/hp700/stand/mkboot/Makefile) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/mkboot/mkboot.c (renamed from sys/arch/hp700/stand/mkboot/mkboot.c) | 40 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/xxboot/Makefile (renamed from sys/arch/hp700/stand/xxboot/Makefile) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/xxboot/README.ipl (renamed from sys/arch/hp700/stand/xxboot/README.ipl) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/xxboot/iplsum.c (renamed from sys/arch/hp700/stand/xxboot/iplsum.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/xxboot/main.c (renamed from sys/arch/hp700/stand/xxboot/main.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/xxboot/readufs.c (renamed from sys/arch/hp700/stand/xxboot/readufs.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/xxboot/readufs.h (renamed from sys/arch/hp700/stand/xxboot/readufs.h) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/xxboot/readufs_ffs.c (renamed from sys/arch/hp700/stand/xxboot/readufs_ffs.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/xxboot/readufs_lfs.c (renamed from sys/arch/hp700/stand/xxboot/readufs_lfs.c) | 2 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/xxboot/start.S (renamed from sys/arch/hp700/stand/xxboot/start.S) | 4 | ||||
| -rw-r--r-- | sys/dev/TODO.audiomp | 2 | ||||
| -rw-r--r-- | sys/dev/dkwedge/dkwedge_bsdlabel.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/i82596.c | 8 | ||||
| -rw-r--r-- | sys/sys/bootblock.h | 62 | ||||
| -rw-r--r-- | tools/Makefile | 6 | ||||
| -rw-r--r-- | tools/headerlist | 5 | ||||
| -rw-r--r-- | tools/hp700-mkboot/Makefile | 8 | ||||
| -rw-r--r-- | tools/hppa-mkboot/Makefile | 8 | ||||
| -rw-r--r-- | usr.bin/calendar/calendars/calendar.netbsd | 1 | ||||
| -rw-r--r-- | usr.bin/make/Makefile.boot | 4 | ||||
| -rw-r--r-- | usr.sbin/crash/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/installboot/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/installboot/arch/hppa.c (renamed from usr.sbin/installboot/arch/hp700.c) | 50 | ||||
| -rw-r--r-- | usr.sbin/installboot/installboot.8 | 10 | ||||
| -rw-r--r-- | usr.sbin/installboot/installboot.h | 4 | ||||
| -rw-r--r-- | usr.sbin/installboot/machines.c | 8 | ||||
| -rw-r--r-- | usr.sbin/rbootd/rbootd.8 | 4 |
301 files changed, 1432 insertions, 1723 deletions
@@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.275 2014/02/10 08:20:05 apb Exp $ +# $NetBSD: build.sh,v 1.276 2014/02/24 07:23:38 skrll Exp $ # # Copyright (c) 2001-2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -618,7 +618,7 @@ MACHINE=evbsh3 MACHINE_ARCH=sh3eb ALIAS=evbsh3-eb MACHINE=evbsh3 MACHINE_ARCH=sh3el ALIAS=evbsh3-el MACHINE=ews4800mips MACHINE_ARCH=mipseb MACHINE=hp300 MACHINE_ARCH=m68k -MACHINE=hp700 MACHINE_ARCH=hppa +MACHINE=hppa MACHINE_ARCH=hppa MACHINE=hpcarm MACHINE_ARCH=arm DEFAULT MACHINE=hpcarm MACHINE_ARCH=earm ALIAS=hpcearm MACHINE=hpcmips MACHINE_ARCH=mipsel @@ -1745,7 +1745,7 @@ createmakewrapper() eval cat <<EOF ${makewrapout} #! ${HOST_SH} # Set proper variables to allow easy "make" building of a NetBSD subtree. -# Generated from: \$NetBSD: build.sh,v 1.275 2014/02/10 08:20:05 apb Exp $ +# Generated from: \$NetBSD: build.sh,v 1.276 2014/02/24 07:23:38 skrll Exp $ # with these arguments: ${_args} # diff --git a/distrib/cdrom/current.conf b/distrib/cdrom/current.conf index 19f706497be..aca2a899b63 100644 --- a/distrib/cdrom/current.conf +++ b/distrib/cdrom/current.conf @@ -1,4 +1,4 @@ -# $NetBSD: current.conf,v 1.11 2008/11/21 15:49:51 ad Exp $ +# $NetBSD: current.conf,v 1.12 2014/02/24 07:23:38 skrll Exp $ # # Makefile fragment for CD sets; includes config information. @@ -48,7 +48,7 @@ CD_IMAGES+= evbppccd-${ISO_RELEASE} CD_IMAGES+= evbsh3-sh3ebcd-${ISO_RELEASE} CD_IMAGES+= evbsh3-sh3elcd-${ISO_RELEASE} CD_IMAGES+= hp300cd-${ISO_RELEASE} -CD_IMAGES+= hp700cd-${ISO_RELEASE} +CD_IMAGES+= hppacd-${ISO_RELEASE} CD_IMAGES+= hpcarmcd-${ISO_RELEASE} CD_IMAGES+= hpcmipscd-${ISO_RELEASE} CD_IMAGES+= hpcshcd-${ISO_RELEASE} diff --git a/distrib/hp700/Makefile b/distrib/hppa/Makefile index 396e1138a99..c5e4f468c0b 100644 --- a/distrib/hp700/Makefile +++ b/distrib/hppa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/01/06 20:16:24 skrll Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:38 skrll Exp $ SUBDIR= ramdisk .WAIT kernel cdroms sysnbsd TARGETS+=release diff --git a/distrib/hp700/cdroms/Makefile b/distrib/hppa/cdroms/Makefile index 9e13c3458f7..975898c3d87 100644 --- a/distrib/hp700/cdroms/Makefile +++ b/distrib/hppa/cdroms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:02 bouyer Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:38 skrll Exp $ SUBDIR= installcd TARGETS+= release iso_image diff --git a/distrib/hp700/cdroms/Makefile.cdrom b/distrib/hppa/cdroms/Makefile.cdrom index f4a73450bf0..dc6a842dc16 100644 --- a/distrib/hp700/cdroms/Makefile.cdrom +++ b/distrib/hppa/cdroms/Makefile.cdrom @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.cdrom,v 1.1 2008/05/10 19:22:17 skrll Exp $ +# $NetBSD: Makefile.cdrom,v 1.1 2014/02/24 07:23:38 skrll Exp $ BOOTFILE= cdboot.lif @@ -8,4 +8,4 @@ CDKERNELS= netbsd-RAMDISK netbsd # from ../instkernel prepare_md_post: ${RM} -f cdrom/${BOOTFILE} - ${TOOL_HP700MKBOOT} ${DESTDIR}/usr/mdec/cdboot cdrom/${BOOTFILE} + ${TOOL_HPPAMKBOOT} ${DESTDIR}/usr/mdec/cdboot cdrom/${BOOTFILE} diff --git a/distrib/hp700/cdroms/installcd/Makefile b/distrib/hppa/cdroms/installcd/Makefile index 4f2836d3211..ea21f4a1c67 100644 --- a/distrib/hp700/cdroms/installcd/Makefile +++ b/distrib/hppa/cdroms/installcd/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2008/05/10 19:22:17 skrll Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:38 skrll Exp $ .include "${.CURDIR}/../Makefile.cdrom" -CDBASE= hp700cd # gives ${CDBASE}.iso +CDBASE= hppacd # gives ${CDBASE}.iso CDRELEASE= true # include $RELEASEDIR/$MACHINE .include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/hp700/kernel/Makefile b/distrib/hppa/kernel/Makefile index 1f91ddc8d74..f3ba00dc296 100644 --- a/distrib/hp700/kernel/Makefile +++ b/distrib/hppa/kernel/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2008/06/23 02:16:53 matt Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:38 skrll Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" -MKBOOT = ${TOOLDIR}/bin/${_TOOL_PREFIX}hp700-mkboot +MKBOOT = ${TOOLDIR}/bin/${_TOOL_PREFIX}hppa-mkboot RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs diff --git a/distrib/hp700/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile index 034147f5775..0fec974fbd5 100644 --- a/distrib/hp700/ramdisk/Makefile +++ b/distrib/hppa/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/04/29 14:42:11 skrll Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:38 skrll Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" diff --git a/distrib/hp700/ramdisk/dot.profile b/distrib/hppa/ramdisk/dot.profile index ba88c3d0bbb..b7bb1510fdb 100644 --- a/distrib/hp700/ramdisk/dot.profile +++ b/distrib/hppa/ramdisk/dot.profile @@ -1,4 +1,4 @@ -# $NetBSD: dot.profile,v 1.2 2006/12/06 10:27:00 skrll Exp $ +# $NetBSD: dot.profile,v 1.1 2014/02/24 07:23:38 skrll Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou diff --git a/distrib/hp700/ramdisk/list b/distrib/hppa/ramdisk/list index 30b6812e3b1..8b0faa87b6c 100644 --- a/distrib/hp700/ramdisk/list +++ b/distrib/hppa/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.15 2011/01/14 10:26:32 tsutsui Exp $ +# $NetBSD: list,v 1.1 2014/02/24 07:23:38 skrll Exp $ SRCDIRS bin sbin usr.bin usr.sbin diff --git a/distrib/hp700/sysnbsd/Makefile b/distrib/hppa/sysnbsd/Makefile index 1e16bc01621..7c9f6c281d6 100644 --- a/distrib/hp700/sysnbsd/Makefile +++ b/distrib/hppa/sysnbsd/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2008/06/23 02:16:53 matt Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:39 skrll Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" -MKBOOT = ${TOOLDIR}/bin/${_TOOL_PREFIX}hp700-mkboot +MKBOOT = ${TOOLDIR}/bin/${_TOOL_PREFIX}hppa-mkboot .include <bsd.kernobj.mk> diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile index e4e6513a29e..ea23d8e556b 100644 --- a/distrib/notes/Makefile +++ b/distrib/notes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2012/01/29 15:54:35 phx Exp $ +# $NetBSD: Makefile,v 1.44 2014/02/24 07:23:39 skrll Exp $ # .include <bsd.own.mk> @@ -23,7 +23,7 @@ SUBDIR+= emips SUBDIR+= evbarm SUBDIR+= evbppc SUBDIR+= hp300 -SUBDIR+= hp700 +SUBDIR+= hppa SUBDIR+= hpcmips SUBDIR+= hpcsh SUBDIR+= i386 diff --git a/distrib/notes/common/list-setsizes.sh b/distrib/notes/common/list-setsizes.sh index 396e3b41b1f..6b601117794 100644 --- a/distrib/notes/common/list-setsizes.sh +++ b/distrib/notes/common/list-setsizes.sh @@ -38,7 +38,7 @@ ports="acorn26 acorn32 algor alpha amd64 amiga arc atari bebox cats cesfic cobalt dreamcast evbarm evbmips evbppc evbsh3 - hp300 hp700 hpcarm hpcmips hpcsh i386 ibmnws iyonix landisk luna68k + hp300 hppa hpcarm hpcmips hpcsh i386 ibmnws iyonix landisk luna68k mac68k macppc mipsco mmeye mvme68k mvmeppc netwinder news68k newsmips next68k ofppc pmax prep sandpoint sbmips sgimips shark sparc sparc64 sun2 sun3 vax x68k" diff --git a/distrib/notes/common/macros b/distrib/notes/common/macros index 52b224583f1..8153935803a 100644 --- a/distrib/notes/common/macros +++ b/distrib/notes/common/macros @@ -1,4 +1,4 @@ -.\" $NetBSD: macros,v 1.38 2009/12/05 16:29:10 pooka Exp $ +.\" $NetBSD: macros,v 1.39 2014/02/24 07:23:39 skrll Exp $ .\" .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -395,7 +395,6 @@ . .ds A \*M .if \n[acorn26]:\n[acorn32]:\n[cats]:\n[evbarm]:\n[hpcarm]:\n[iyonix]:\n[netwinder]:\n[shark]:\n[zaurus] .ds A arm -.if \n[hp700] .ds A hppa .if \n[sun2] .ds A m68000 .if \n[amiga]:\n[atari]:\n[cesfic]:\n[hp300]:\n[luna68k]:\n[mac68k]:\n[mvme68k]:\n[news68k]:\n[next68k]:\n[sun3]:\n[x68k] .ds A m68k .if \n[ews4800mips]:\n[mipsco]:\n[newsmips]:\n[sbmips]:\n[sgimips] .ds A mipseb diff --git a/distrib/notes/common/main b/distrib/notes/common/main index b162f8dda68..c18fd941a8d 100644 --- a/distrib/notes/common/main +++ b/distrib/notes/common/main @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.505 2014/02/10 06:36:53 pedro Exp $ +.\" $NetBSD: main,v 1.506 2014/02/24 07:23:39 skrll Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -43,7 +43,7 @@ .nr DOC_XR 1 .ds MACHINE_LIST acorn26 acorn32 algor alpha amd64 amiga amigappc arc atari .as MACHINE_LIST " bebox cats cesfic cobalt dreamcast evbarm evbmips evbppc -.as MACHINE_LIST " evbsh3 ews4800mips hp300 hp700 hpcarm hpcmips hpcsh i386 +.as MACHINE_LIST " evbsh3 ews4800mips hp300 hppa hpcarm hpcmips hpcsh i386 .as MACHINE_LIST " ibmnws iyonix landisk luna68k mac68k macppc mipsco mmeye .as MACHINE_LIST " mvme68k mvmeppc netwinder news68k newsmips next68k ofppc .as MACHINE_LIST " pmax prep rs6000 sandpoint sbmips @@ -1057,7 +1057,7 @@ If you're one of them, and would like to be mentioned, tell us!) .It Ta Steve Woodford Ta Mt scw Ta Sy evbppc .It Ta Izumi Tsutsui Ta Mt tsutsui Ta Sy ews4800mips .It Ta Izumi Tsutsui Ta Mt tsutsui Ta Sy hp300 -.It Ta Nick Hudson Ta Mt skrll Ta Sy hp700 +.It Ta Nick Hudson Ta Mt skrll Ta Sy hppa .It Ta Valeriy E. Ushakov Ta Mt uwe Ta Sy hpcsh .It Ta Matt Thomas Ta Mt matt Ta Sy ibmnws .It Ta Gavan Fantom Ta Mt gavan Ta Sy iyonix diff --git a/distrib/notes/common/netboot b/distrib/notes/common/netboot index 505400b65ee..d99309975c7 100644 --- a/distrib/notes/common/netboot +++ b/distrib/notes/common/netboot @@ -1,4 +1,4 @@ -.\" $NetBSD: netboot,v 1.34 2009/01/26 00:14:42 snj Exp $ +.\" $NetBSD: netboot,v 1.35 2014/02/24 07:23:39 skrll Exp $ .\" .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -42,7 +42,7 @@ If the server(s) are another operating system, you should consult the NetBSD Diskless HOW-TO, which will walk you through the steps necessary to configure the netboot services on a variety of platforms. .Lk http://www.NetBSD.org/docs/network/netboot/ -.if !\n[hp700]:\n[next68k] \{\ +.if !\n[hppa]:\n[next68k] \{\ .Pp You may either netboot the installer so you can install onto a locally attached disk, or you may run your system entirely over the network. @@ -61,7 +61,7 @@ process involves discovery, bootstrap, kernel and file system stages. In the first stage, the client discovers information about where to find the bootstrap program. Next, it downloads and executes the bootstrap program. -.ie \n[hp700] \{\ +.ie \n[hppa] \{\ The server contains one large file (a LIF file system) with the bootloader and the kernel. The bootstrap program simply loads the kernel from the LIF image. @@ -73,7 +73,7 @@ The bootstrap program tries to mount the NFS share containing the kernel. .\} Once the kernel is loaded, it starts executing. .\} -.ie !\n[hp700]:\n[next68k] \{\ +.ie !\n[hppa]:\n[next68k] \{\ For RAM disk kernels, it mounts the RAM disk file system and begins executing the installer from the RAM disk. For normal (non-RAM disk) kernels, the @@ -81,7 +81,7 @@ For normal (non-RAM disk) kernels, the .el The kernel tries to mount the NFS share that had the kernel and starts executing -.if !\n[hp700]:\n[next68k] the installation tools or +.if !\n[hppa]:\n[next68k] the installation tools or .Xr init 8 . .if \n[hp300] \{\ All supported \*M systems use HP's proprietary RMP (the @@ -89,7 +89,7 @@ All supported \*M systems use HP's proprietary RMP (the daemon) for the first discovery stage and bootstrap download stages. The bootstrap program uses DHCP for its discovery stage. .\} -.if \n[hp700] \{\ +.if \n[hppa] \{\ Early \*M systems use HP's proprietary RMP (the .Xr rbootd 8 daemon) for the discovery stage, bootstrap download, and kernel download @@ -108,7 +108,7 @@ booting from OpenFirmware use DHCP. .if \n[sparc64] \{\ All \*M systems use a combination of RARP and DHCP for the discovery stage. .\} -.if !\n[hp300]:\n[hp700] \{\ +.if !\n[hp300]:\n[hppa] \{\ TFTP is used in the bootstrap phase to download .if \n[macppc] \{\ the bootstrap program, @@ -146,8 +146,8 @@ will not suffice; you have to provide a second Ethernet card supported by .Nx "" . .\} -.\} \" ! !\n[hp300]:\n[hp700] -.if !\n[evbppc]:\n[hp700] \{\ +.\} \" ! !\n[hp300]:\n[hppa] +.if !\n[evbppc]:\n[hppa] \{\ NFS is used in both the kernel and file system stages to download the kernel, and to access files on the file server. .\} \" !\n[evbppc] @@ -173,7 +173,7 @@ and paths appropriate to your environment. You should set up each netboot stage in order (i.e., discovery, bootstrap, kernel, and then file system) so that you can test them as you proceed. -.if \n[hp700] \{\ +.if \n[hppa] \{\ .Pp If your system uses RMP to netboot, you must set up .Xr rbootd 8 @@ -190,21 +190,21 @@ but can skip .\} .Pp .It -.if \n[hp300]:\n[hp700] \{\ +.if \n[hp300]:\n[hppa] \{\ .Xr rbootd 8 .Pp Get .if \n[hp300] .Pa SYS_UBOOT -.if \n[hp700] .Pa SYSNBSD +.if \n[hppa] .Pa SYSNBSD from the .if \n[hp300] .Pa installation/misc -.if \n[hp700] .Pa installation +.if \n[hppa] .Pa installation directory of the distribution. .Pp .(disp .No # Ic "mkdir -p /usr/mdec/rbootd" .if \n[hp300] .No # Ic "cp SYS_UBOOT /usr/mdec/rbootd" -.if \n[hp700] .No # Ic "cp SYSNBSD /usr/mdec/rbootd" +.if \n[hppa] .No # Ic "cp SYSNBSD /usr/mdec/rbootd" .No # Ic "chmod -R a+rX /usr/mdec/rbootd" .disp) .Pp @@ -213,7 +213,7 @@ Create with the following line: .(disp .if \n[hp300] CC:CC:CC:CC:CC:CC SYS_UBOOT -.if \n[hp700] CC:CC:CC:CC:CC:CC SYSNBSD +.if \n[hppa] CC:CC:CC:CC:CC:CC SYSNBSD .disp) .Pp You will need to start the @@ -241,8 +241,8 @@ in the NetBSD Diskless HOW-TO for details. .Pp .It -.\} \" ! \n[hp300]:\n[hp700] -.if \n[evbppc]:\n[hp300]:\n[hp700]:\n[macppc]:\n[next68k]:\n[sparc]:\n[sparc64] \{\ +.\} \" ! \n[hp300]:\n[hppa] +.if \n[evbppc]:\n[hp300]:\n[hppa]:\n[macppc]:\n[next68k]:\n[sparc]:\n[sparc64] \{\ .ie !\n[hp300] \{\ .Xr dhcpd 8 in @@ -316,7 +316,7 @@ group { # filename "bootjs.net"; .\} -.if \n[hp700] \{\ +.if \n[hppa] \{\ # filename "SYSNBSD"; .\} @@ -389,7 +389,7 @@ you can achieve this with: .No # Ic "/etc/rc.d/dhcpd restart" .disp) .Pp -.\} \" ! \n[evbppc]:\n[hp300]:\n[hp700]:\n[macppc]:\n[next68k]:\n[sparc]:\n[sparc64] +.\} \" ! \n[evbppc]:\n[hp300]:\n[hppa]:\n[macppc]:\n[next68k]:\n[sparc]:\n[sparc64] .if \n[sparc]:\n[sparc64] \{\ .Pp .It @@ -467,7 +467,7 @@ Now, you need to copy the .el bootloader for your \*M machine to .Pa /tftpboot . -.if \n[hp700] \{\ +.if \n[hppa] \{\ Get .Pa SYSNBSD from the @@ -630,15 +630,15 @@ you can achieve this with: .It .Nx kernel -.if !\n[next68k]:\n[hp700] and installation tools +.if !\n[next68k]:\n[hppa] and installation tools .Pp -.if !\n[evbppc]:\n[hp700] \{\ +.if !\n[evbppc]:\n[hppa] \{\ Now, if you place a kernel named .Pa netbsd in .Pa /export/client/root your client should boot the kernel. -.\} \" !\n[evbppc]:\n[hp700] +.\} \" !\n[evbppc]:\n[hppa] .if \n[hp300] \{\ If you are netbooting the installer, you can use either the traditional miniroot-based installer @@ -681,7 +681,7 @@ Also, copy the distribution files to the client's root directory. If you are running your \*M diskless, simply use .Pa binary/kernel/netbsd-GENERIC.gz . .\} \" \n[hp300] -.if \n[hp700] \{\ +.if \n[hppa] \{\ You do not need to place a kernel in .Pa /export/client/root since the kernel is contained inside @@ -758,7 +758,7 @@ If you are running your \*M diskless, simply use .It Client file system .Pp -.ie !\n[hp700]:\n[next68k] \{\ +.ie !\n[hppa]:\n[next68k] \{\ You can skip this step if you do not plan to run your client diskless after installation. Otherwise, you @@ -855,16 +855,16 @@ Edit .It Setting up the server daemons .Pp -.ie !\n[hp700]:\n[next68k] If you want +.ie !\n[hppa]:\n[next68k] If you want .el You need these services to start up every time you boot your server, make sure the following lines are present in your .Pa /etc/rc.conf : .(disp -.if \n[hp300]:\n[hp700] \{\ +.if \n[hp300]:\n[hppa] \{\ rbootd=YES rbootd_flags="" .\} -.if \n[hp300]:\n[hp700]:\n[macppc]:\n[next68k]:\n[sparc]:\n[sparc64] \{\ +.if \n[hp300]:\n[hppa]:\n[macppc]:\n[next68k]:\n[sparc]:\n[sparc64] \{\ dhcpd=YES dhcpd_flags="-q" .\} .if \n[sparc]:\n[sparc64] \{\ diff --git a/distrib/notes/common/postinstall b/distrib/notes/common/postinstall index 13e241fee9d..1f5abf2051b 100644 --- a/distrib/notes/common/postinstall +++ b/distrib/notes/common/postinstall @@ -1,4 +1,4 @@ -.\" $NetBSD: postinstall,v 1.77 2012/10/02 17:43:52 roy Exp $ +.\" $NetBSD: postinstall,v 1.78 2014/02/24 07:23:39 skrll Exp $ .\" .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -163,7 +163,7 @@ For example: .if \n[arc] .ds IFname sn0 .if \n[cats] .ds IFname tlp0 .if \n[evbarm] .ds IFname fxp0 -.if \n[hp700] .ds IFname ie0 +.if \n[hppa] .ds IFname ie0 .if \n[hpcmips] .ds IFname ne0 .if \n[hpcsh] .ds IFname ne0 .if \n[i386] .ds IFname wm0 diff --git a/distrib/notes/common/sysinst b/distrib/notes/common/sysinst index ff77842725b..6e2b59f453a 100644 --- a/distrib/notes/common/sysinst +++ b/distrib/notes/common/sysinst @@ -1,4 +1,4 @@ -.\" $NetBSD: sysinst,v 1.102 2012/08/17 19:55:14 riz Exp $ +.\" $NetBSD: sysinst,v 1.103 2014/02/24 07:23:39 skrll Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -48,7 +48,7 @@ . ds part_usr e .\} .if \n[amiga]:\n[amigappc]:\n[arc]:\n[atari]:\n[cobalt]:\n[evbmips]:\ -\n[evbppc]:\n[hp700]:\n[hpcmips]:\n[i386]:\n[macppc]:\n[ofppc]:\ +\n[evbppc]:\n[hppa]:\n[hpcmips]:\n[i386]:\n[macppc]:\n[ofppc]:\ \n[sandpoint]:\n[sbmips]:\n[sgimips]:\n[x86_64] \{\ . ds part_max p .\} @@ -83,7 +83,7 @@ covers many details for the sake of completeness. Do not let this discourage you; the install program is not hard to use. . -.if !\n[acorn26]:\n[acorn32]:\n[atari]:\n[ews4800mips]:\n[hp700]:\n[mac68k]:\n[macppc]:\n[mvme68k]:\n[news68k]:\n[newsmips]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64]:\n[x68k] \{\ +.if !\n[acorn26]:\n[acorn32]:\n[atari]:\n[ews4800mips]:\n[hppa]:\n[mac68k]:\n[macppc]:\n[mvme68k]:\n[news68k]:\n[newsmips]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64]:\n[x68k] \{\ .It .To 2 "Possible hardware problems" .Em Possible hardware problems @@ -97,7 +97,7 @@ Non-removable devices can be disabled with .Ic boot .Fl c to enter it). -.\} \" !\n[acorn26]:\n[acorn32]:\n[atari]:\n[ews4800mips]:\n[hp700]:\n[mac68k]\:[macppc]:\n[mvme68k]:\n[news68k]:\n[newsmips]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64]:\n[x68k] +.\} \" !\n[acorn26]:\n[acorn32]:\n[atari]:\n[ews4800mips]:\n[hppa]:\n[mac68k]\:[macppc]:\n[mvme68k]:\n[news68k]:\n[newsmips]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64]:\n[x68k] .if \n[mac68k] \{\ .It .To 2 "Possible hardware-specific issues" @@ -182,7 +182,7 @@ The distribution sets (in this example, they are on CD). .It .ie \n[ews4800mips] Two floppy disks. .el \{\ -.ie \n[hp700] \{\ +.ie \n[hppa] \{\ The .Pa netinstall.lif volume on a netboot server as described above. @@ -220,7 +220,7 @@ a hard disk and a minimum of .if \n[atari] 4 MB (TT030/Falcon) or 16 MB (Hades/Milan) .if \n[cats] 8 MB .if \n[ews4800mips] 16 MB -.if \n[hp700] 32 MB +.if \n[hppa] 32 MB .if \n[i386] 32 MB .if \n[mac68k] 8 MB .if \n[macppc] 16 MB @@ -243,7 +243,7 @@ The hard disk should have at least .if \n[atari] 120 .if \n[cats] 200 .if \n[ews4800mips] 200 -.if \n[hp700] 200 +.if \n[hppa] 200 .if \n[i386] 200 .if \n[mac68k] 120 .if \n[macppc] 200 @@ -332,7 +332,7 @@ kernels while booting. .It The Quick Installation .(bullet -.ie \n[acorn26]:\n[atari]:\n[cats]:\n[evbppc]:\n[hp700]:\n[macppc]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64] \{\ +.ie \n[acorn26]:\n[atari]:\n[cats]:\n[evbppc]:\n[hppa]:\n[macppc]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64] \{\ Boot the system as described above. You should be at the .Ic sysinst diff --git a/distrib/notes/hp700/legal b/distrib/notes/hp700/legal deleted file mode 100644 index 776fad9eaab..00000000000 --- a/distrib/notes/hp700/legal +++ /dev/null @@ -1,2 +0,0 @@ -.\" $NetBSD: legal,v 1.1 2003/10/10 23:53:21 mbw Exp $ -. diff --git a/distrib/notes/hp700/Makefile b/distrib/notes/hppa/Makefile index dddaa14f37b..833b22209d1 100644 --- a/distrib/notes/hp700/Makefile +++ b/distrib/notes/hppa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/01/06 20:16:25 skrll Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:39 skrll Exp $ MERGED_SRCS+= ${COMMON}/netboot MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer diff --git a/distrib/notes/hp700/contents b/distrib/notes/hppa/contents index c34c6f43dd3..7a538a56717 100644 --- a/distrib/notes/hp700/contents +++ b/distrib/notes/hppa/contents @@ -1,4 +1,4 @@ -.\" $NetBSD: contents,v 1.1 2011/05/28 06:00:08 tsutsui Exp $ +.\" $NetBSD: contents,v 1.1 2014/02/24 07:23:39 skrll Exp $ .\" .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\" All rights reserved. diff --git a/distrib/notes/hp700/hardware b/distrib/notes/hppa/hardware index 8a67e6a7df3..7493f30cb9a 100644 --- a/distrib/notes/hp700/hardware +++ b/distrib/notes/hppa/hardware @@ -1,14 +1,14 @@ -.\" $NetBSD: hardware,v 1.4 2008/01/06 20:16:25 skrll Exp $ +.\" $NetBSD: hardware,v 1.1 2014/02/24 07:23:39 skrll Exp $ . Since .Nx*M is an experimental port, the hardware support is in a constant state of flux. Check the -.Mt port-hp700@NetBSD.org +.Mt port-hppa@NetBSD.org mailing list and the .Nx*M port homepage for an up-to-date list of known supported hardware. -.Lk http://www.NetBSD.org/ports/hp700/ +.Lk http://www.NetBSD.org/ports/hppa/ .Pp .Nx*M \*V works from local disk, once installed, or diskless via netboot. diff --git a/distrib/notes/hp700/install b/distrib/notes/hppa/install index 7684105a4e5..6fc2adead3f 100644 --- a/distrib/notes/hp700/install +++ b/distrib/notes/hppa/install @@ -1,4 +1,4 @@ -.\" $NetBSD: install,v 1.2 2008/01/06 20:16:25 skrll Exp $ +.\" $NetBSD: install,v 1.1 2014/02/24 07:23:39 skrll Exp $ . .Ss2 Installing NetBSD by using a netboot setup . diff --git a/distrib/notes/hppa/legal b/distrib/notes/hppa/legal new file mode 100644 index 00000000000..82fdd228a9a --- /dev/null +++ b/distrib/notes/hppa/legal @@ -0,0 +1,2 @@ +.\" $NetBSD: legal,v 1.1 2014/02/24 07:23:39 skrll Exp $ +. diff --git a/distrib/notes/hp700/prep b/distrib/notes/hppa/prep index e1c1b05d4a0..f578ab6ee43 100644 --- a/distrib/notes/hp700/prep +++ b/distrib/notes/hppa/prep @@ -1,4 +1,4 @@ -.\" $NetBSD: prep,v 1.2 2008/09/06 22:05:36 tsutsui Exp $ +.\" $NetBSD: prep,v 1.1 2014/02/24 07:23:39 skrll Exp $ . .Ss2 Get to the Boot Administration prompt . diff --git a/distrib/notes/hp700/upgrade b/distrib/notes/hppa/upgrade index 58e7fac9fb1..bd1d3582e4c 100644 --- a/distrib/notes/hp700/upgrade +++ b/distrib/notes/hppa/upgrade @@ -1,4 +1,4 @@ -.\" $NetBSD: upgrade,v 1.3 2008/04/30 13:10:48 martin Exp $ +.\" $NetBSD: upgrade,v 1.1 2014/02/24 07:23:39 skrll Exp $ .\" .\" Copyright (c) 1999-2000 The NetBSD Foundation, Inc. .\" All rights reserved. diff --git a/distrib/notes/hp700/xfer b/distrib/notes/hppa/xfer index e28bc517cc1..91c079ed9d4 100644 --- a/distrib/notes/hp700/xfer +++ b/distrib/notes/hppa/xfer @@ -1,4 +1,4 @@ -.\" $NetBSD: xfer,v 1.4 2011/05/27 17:38:43 tsutsui Exp $ +.\" $NetBSD: xfer,v 1.1 2014/02/24 07:23:39 skrll Exp $ .\" .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -34,7 +34,7 @@ Logical Interchange Format (LIF) volume of the kernel you wish to boot, or the .Pa netinstall.lif volume available in the -.Pa hp700/installation +.Pa hppa/installation directory of the .Nx distribution. diff --git a/distrib/sets/lists/base/md.hp700 b/distrib/sets/lists/base/md.hppa index 040ab8f75bb..fcec91013e5 100644 --- a/distrib/sets/lists/base/md.hp700 +++ b/distrib/sets/lists/base/md.hppa @@ -1,4 +1,4 @@ -# $NetBSD: md.hp700,v 1.6 2008/11/29 17:57:33 tsutsui Exp $ +# $NetBSD: md.hppa,v 1.1 2014/02/24 07:23:39 skrll Exp $ ./usr/mdec/boot base-sysutil-bin ./usr/mdec/cdboot base-sysutil-bin ./usr/mdec/mkboot base-sysutil-bin diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 7f7572c04c2..64df074d45d 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1061 2014/01/23 07:26:50 spz Exp $ +# $NetBSD: mi,v 1.1062 2014/02/24 07:23:39 skrll Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -3920,10 +3920,10 @@ ./usr/share/man/cat4/evbmips base-man-share ./usr/share/man/cat4/evbppc base-man-share ./usr/share/man/cat4/hp300 base-man-share -./usr/share/man/cat4/hp700 base-man-share ./usr/share/man/cat4/hpcarm base-man-share ./usr/share/man/cat4/hpcmips base-man-share ./usr/share/man/cat4/hpcsh base-man-share +./usr/share/man/cat4/hppa base-man-share ./usr/share/man/cat4/i386 base-man-share ./usr/share/man/cat4/mac68k base-man-share ./usr/share/man/cat4/macppc base-man-share @@ -3968,10 +3968,10 @@ ./usr/share/man/cat8/evbsh3 base-man-share ./usr/share/man/cat8/evbsh5 base-obsolete obsolete ./usr/share/man/cat8/hp300 base-man-share -./usr/share/man/cat8/hp700 base-man-share ./usr/share/man/cat8/hpcarm base-man-share ./usr/share/man/cat8/hpcmips base-man-share ./usr/share/man/cat8/hpcsh base-man-share +./usr/share/man/cat8/hppa base-man-share ./usr/share/man/cat8/i386 base-man-share ./usr/share/man/cat8/ibmnws base-man-share ./usr/share/man/cat8/luna68k base-man-share @@ -4048,10 +4048,10 @@ ./usr/share/man/html4/evbmips base-man-share ./usr/share/man/html4/evbppc base-man-share ./usr/share/man/html4/hp300 base-man-share -./usr/share/man/html4/hp700 base-man-share ./usr/share/man/html4/hpcarm base-man-share ./usr/share/man/html4/hpcmips base-man-share ./usr/share/man/html4/hpcsh base-man-share +./usr/share/man/html4/hppa base-man-share ./usr/share/man/html4/i386 base-man-share ./usr/share/man/html4/mac68k base-man-share ./usr/share/man/html4/macppc base-man-share @@ -4095,10 +4095,10 @@ ./usr/share/man/html8/evbsh3 base-man-share ./usr/share/man/html8/evbsh5 base-obsolete obsolete ./usr/share/man/html8/hp300 base-man-share -./usr/share/man/html8/hp700 base-man-share ./usr/share/man/html8/hpcarm base-man-share ./usr/share/man/html8/hpcmips base-man-share ./usr/share/man/html8/hpcsh base-man-share +./usr/share/man/html8/hppa base-man-share ./usr/share/man/html8/i386 base-man-share ./usr/share/man/html8/ibmnws base-man-share ./usr/share/man/html8/luna68k base-man-share @@ -4177,10 +4177,10 @@ ./usr/share/man/man4/evbmips base-man-share ./usr/share/man/man4/evbppc base-man-share ./usr/share/man/man4/hp300 base-man-share -./usr/share/man/man4/hp700 base-man-share ./usr/share/man/man4/hpcarm base-man-share ./usr/share/man/man4/hpcmips base-man-share ./usr/share/man/man4/hpcsh base-man-share +./usr/share/man/man4/hppa base-man-share ./usr/share/man/man4/i386 base-man-share ./usr/share/man/man4/mac68k base-man-share ./usr/share/man/man4/macppc base-man-share @@ -4225,10 +4225,10 @@ ./usr/share/man/man8/evbsh3 base-man-share ./usr/share/man/man8/evbsh5 base-obsolete obsolete ./usr/share/man/man8/hp300 base-man-share -./usr/share/man/man8/hp700 base-man-share ./usr/share/man/man8/hpcarm base-man-share ./usr/share/man/man8/hpcmips base-man-share ./usr/share/man/man8/hpcsh base-man-share +./usr/share/man/man8/hppa base-man-share ./usr/share/man/man8/i386 base-man-share ./usr/share/man/man8/ibmnws base-man-share ./usr/share/man/man8/luna68k base-man-share diff --git a/distrib/sets/lists/comp/md.hp700 b/distrib/sets/lists/comp/md.hp700 deleted file mode 100644 index 4c2b4c9e1bb..00000000000 --- a/distrib/sets/lists/comp/md.hp700 +++ /dev/null @@ -1,63 +0,0 @@ -# $NetBSD: md.hp700,v 1.10 2013/01/16 16:01:06 christos Exp $ -./usr/include/hp700 comp-c-include -./usr/include/hp700/ansi.h comp-c-include -./usr/include/hp700/aout_machdep.h comp-c-include -./usr/include/hp700/asm.h comp-c-include -./usr/include/hp700/autoconf.h comp-c-include -./usr/include/hp700/bswap.h comp-c-include -./usr/include/hp700/bus.h comp-obsolete obsolete -./usr/include/hp700/byte_swap.h comp-c-include -./usr/include/hp700/cdefs.h comp-c-include -./usr/include/hp700/cpu.h comp-c-include -./usr/include/hp700/cpufunc.h comp-c-include -./usr/include/hp700/db_machdep.h comp-obsolete obsolete -./usr/include/hp700/disklabel.h comp-c-include -./usr/include/hp700/eisa_machdep.h comp-c-include -./usr/include/hp700/elf_machdep.h comp-c-include -./usr/include/hp700/endian.h comp-c-include -./usr/include/hp700/endian_machdep.h comp-c-include -./usr/include/hp700/exec.h comp-c-include -./usr/include/hp700/float.h comp-c-include -./usr/include/hp700/frame.h comp-c-include -./usr/include/hp700/ieee.h comp-c-include -./usr/include/hp700/ieeefp.h comp-c-include -./usr/include/hp700/int_const.h comp-c-include -./usr/include/hp700/int_fmtio.h comp-c-include -./usr/include/hp700/int_limits.h comp-c-include -./usr/include/hp700/int_mwgwtypes.h comp-c-include -./usr/include/hp700/int_types.h comp-c-include -./usr/include/hp700/intr.h comp-c-include -./usr/include/hp700/intrdefs.h comp-c-include -./usr/include/hp700/iomod.h comp-c-include -./usr/include/hp700/isa_machdep.h comp-c-include -./usr/include/hp700/kcore.h comp-c-include -./usr/include/hp700/limits.h comp-c-include -./usr/include/hp700/loadfile_machdep.h comp-c-include -./usr/include/hp700/lock.h comp-c-include -./usr/include/hp700/math.h comp-c-include -./usr/include/hp700/mcontext.h comp-c-include -./usr/include/hp700/mutex.h comp-c-include -./usr/include/hp700/nvm.h comp-c-include -./usr/include/hp700/param.h comp-c-include -./usr/include/hp700/pcb.h comp-c-include -./usr/include/hp700/pdc.h comp-c-include -./usr/include/hp700/pmap.h comp-c-include -./usr/include/hp700/pmc.h comp-c-include -./usr/include/hp700/proc.h comp-c-include -./usr/include/hp700/profile.h comp-c-include -./usr/include/hp700/psl.h comp-c-include -./usr/include/hp700/pte.h comp-c-include -./usr/include/hp700/ptrace.h comp-c-include -./usr/include/hp700/reg.h comp-c-include -./usr/include/hp700/reloc.h comp-c-include -./usr/include/hp700/rwlock.h comp-c-include -./usr/include/hp700/setjmp.h comp-c-include -./usr/include/hp700/signal.h comp-c-include -./usr/include/hp700/som.h comp-c-include -./usr/include/hp700/spinlock.h comp-obsolete obsolete -./usr/include/hp700/stdarg.h comp-obsolete obsolete -./usr/include/hp700/trap.h comp-c-include -./usr/include/hp700/types.h comp-c-include -./usr/include/hp700/varargs.h comp-obsolete obsolete -./usr/include/hp700/vmparam.h comp-c-include -./usr/include/hp700/wchar_limits.h comp-c-include diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa new file mode 100644 index 00000000000..b700c4135d9 --- /dev/null +++ b/distrib/sets/lists/comp/md.hppa @@ -0,0 +1,66 @@ +# $NetBSD: md.hppa,v 1.1 2014/02/24 07:23:39 skrll Exp $ +./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 +./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc=48 +./usr/include/hppa comp-c-include +./usr/include/hppa/ansi.h comp-c-include +./usr/include/hppa/aout_machdep.h comp-c-include +./usr/include/hppa/asm.h comp-c-include +./usr/include/hppa/autoconf.h comp-c-include +./usr/include/hppa/bswap.h comp-c-include +./usr/include/hppa/bus.h comp-obsolete obsolete +./usr/include/hppa/byte_swap.h comp-c-include +./usr/include/hppa/cdefs.h comp-c-include +./usr/include/hppa/cpu.h comp-c-include +./usr/include/hppa/cpufunc.h comp-c-include +./usr/include/hppa/db_machdep.h comp-obsolete obsolete +./usr/include/hppa/disklabel.h comp-c-include +./usr/include/hppa/eisa_machdep.h comp-c-include +./usr/include/hppa/elf_machdep.h comp-c-include +./usr/include/hppa/endian.h comp-c-include +./usr/include/hppa/endian_machdep.h comp-c-include +./usr/include/hppa/exec.h comp-c-include +./usr/include/hppa/float.h comp-c-include +./usr/include/hppa/frame.h comp-c-include +./usr/include/hppa/ieee.h comp-c-include +./usr/include/hppa/ieeefp.h comp-c-include +./usr/include/hppa/int_const.h comp-c-include +./usr/include/hppa/int_fmtio.h comp-c-include +./usr/include/hppa/int_limits.h comp-c-include +./usr/include/hppa/int_mwgwtypes.h comp-c-include +./usr/include/hppa/int_types.h comp-c-include +./usr/include/hppa/intr.h comp-c-include +./usr/include/hppa/intrdefs.h comp-c-include +./usr/include/hppa/iomod.h comp-c-include +./usr/include/hppa/isa_machdep.h comp-c-include +./usr/include/hppa/kcore.h comp-c-include +./usr/include/hppa/limits.h comp-c-include +./usr/include/hppa/loadfile_machdep.h comp-c-include +./usr/include/hppa/lock.h comp-c-include +./usr/include/hppa/math.h comp-c-include +./usr/include/hppa/mcontext.h comp-c-include +./usr/include/hppa/mutex.h comp-c-include +./usr/include/hppa/nvm.h comp-c-include +./usr/include/hppa/param.h comp-c-include +./usr/include/hppa/pcb.h comp-c-include +./usr/include/hppa/pdc.h comp-c-include +./usr/include/hppa/pmap.h comp-c-include +./usr/include/hppa/pmc.h comp-c-include +./usr/include/hppa/proc.h comp-c-include +./usr/include/hppa/profile.h comp-c-include +./usr/include/hppa/psl.h comp-c-include +./usr/include/hppa/pte.h comp-c-include +./usr/include/hppa/ptrace.h comp-c-include +./usr/include/hppa/reg.h comp-c-include +./usr/include/hppa/reloc.h comp-c-include +./usr/include/hppa/rwlock.h comp-c-include +./usr/include/hppa/setjmp.h comp-c-include +./usr/include/hppa/signal.h comp-c-include +./usr/include/hppa/som.h comp-c-include +./usr/include/hppa/spinlock.h comp-obsolete obsolete +./usr/include/hppa/stdarg.h comp-obsolete obsolete +./usr/include/hppa/trap.h comp-c-include +./usr/include/hppa/types.h comp-c-include +./usr/include/hppa/varargs.h comp-obsolete obsolete +./usr/include/hppa/vmparam.h comp-c-include +./usr/include/hppa/wchar_limits.h comp-c-include +./usr/include/ieeefp.h comp-c-include diff --git a/distrib/sets/lists/debug/md.hp700 b/distrib/sets/lists/debug/md.hppa index c918ee7665f..a13db410803 100644 --- a/distrib/sets/lists/debug/md.hp700 +++ b/distrib/sets/lists/debug/md.hppa @@ -1,2 +1,2 @@ -# $NetBSD: md.hp700,v 1.1 2013/01/16 16:01:07 christos Exp $ +# $NetBSD: md.hppa,v 1.1 2014/02/24 07:23:39 skrll Exp $ ./usr/libdata/debug/usr/mdec/mkboot.debug comp-sysutil-debug debug diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index 9e84b2d13e5..782c27fa360 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1459 2014/02/21 12:26:40 jdc Exp $ +# $NetBSD: mi,v 1.1460 2014/02/24 07:23:39 skrll Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1139,25 +1139,6 @@ ./usr/share/man/cat4/hp300/rtc.0 man-sys-catman .cat ./usr/share/man/cat4/hp300/tc.0 man-obsolete obsolete ./usr/share/man/cat4/hp300/topcat.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/asp.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/astro.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/cpu.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/dino.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/elroy.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/gsc.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/gsckbc.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/harmony.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/intro.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/io.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/lasi.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/lcd.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/mem.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/mongoose.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/pdc.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/phantomas.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/ssio.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/uturn.0 man-sys-catman .cat -./usr/share/man/cat4/hp700/wax.0 man-sys-catman .cat ./usr/share/man/cat4/hpacel.0 man-sys-catman .cat ./usr/share/man/cat4/hpcarm/intro.0 man-sys-catman .cat ./usr/share/man/cat4/hpcarm/j720kbd.0 man-sys-catman .cat @@ -1169,6 +1150,25 @@ ./usr/share/man/cat4/hpcsh/j6x0tp.0 man-sys-catman .cat ./usr/share/man/cat4/hpcsh/psh3lcd.0 man-sys-catman .cat ./usr/share/man/cat4/hpcsh/psh3tp.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/asp.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/astro.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/cpu.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/dino.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/elroy.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/gsc.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/gsckbc.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/harmony.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/intro.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/io.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/lasi.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/lcd.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/mem.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/mongoose.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/pdc.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/phantomas.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/ssio.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/uturn.0 man-sys-catman .cat +./usr/share/man/cat4/hppa/wax.0 man-sys-catman .cat ./usr/share/man/cat4/hpqlb.0 man-sys-catman .cat ./usr/share/man/cat4/hptide.0 man-sys-catman .cat ./usr/share/man/cat4/i386/PCIBIOS.0 man-sys-catman .cat @@ -2442,10 +2442,6 @@ ./usr/share/man/cat8/hp300/crash.0 man-sys-catman .cat ./usr/share/man/cat8/hp300/format.0 man-sys-catman .cat ./usr/share/man/cat8/hp300/makedev.0 man-obsolete obsolete -./usr/share/man/cat8/hp700/MAKEDEV.0 man-obsolete obsolete -./usr/share/man/cat8/hp700/boot.0 man-sys-catman .cat -./usr/share/man/cat8/hp700/makedev.0 man-obsolete obsolete -./usr/share/man/cat8/hp700/mkboot.0 man-sys-catman .cat ./usr/share/man/cat8/hpcarm/MAKEDEV.0 man-obsolete obsolete ./usr/share/man/cat8/hpcarm/boot.0 man-sys-catman .cat ./usr/share/man/cat8/hpcarm/makedev.0 man-obsolete obsolete @@ -2457,6 +2453,10 @@ ./usr/share/man/cat8/hpcsh/MAKEDEV.0 man-obsolete obsolete ./usr/share/man/cat8/hpcsh/boot.0 man-sys-catman .cat ./usr/share/man/cat8/hpcsh/makedev.0 man-obsolete obsolete +./usr/share/man/cat8/hppa/MAKEDEV.0 man-obsolete obsolete +./usr/share/man/cat8/hppa/boot.0 man-sys-catman .cat +./usr/share/man/cat8/hppa/makedev.0 man-obsolete obsolete +./usr/share/man/cat8/hppa/mkboot.0 man-sys-catman .cat ./usr/share/man/cat8/hprop.0 man-krb5-catman kerberos,.cat ./usr/share/man/cat8/hpropd.0 man-krb5-catman kerberos,.cat ./usr/share/man/cat8/htable.0 man-obsolete obsolete @@ -4138,25 +4138,6 @@ ./usr/share/man/html4/hp300/rmp.html man-sys-htmlman html ./usr/share/man/html4/hp300/rtc.html man-sys-htmlman html ./usr/share/man/html4/hp300/topcat.html man-sys-htmlman html -./usr/share/man/html4/hp700/asp.html man-sys-htmlman html -./usr/share/man/html4/hp700/astro.html man-sys-htmlman html -./usr/share/man/html4/hp700/cpu.html man-sys-htmlman html -./usr/share/man/html4/hp700/dino.html man-sys-htmlman html -./usr/share/man/html4/hp700/elroy.html man-sys-htmlman html -./usr/share/man/html4/hp700/gsc.html man-sys-htmlman html -./usr/share/man/html4/hp700/gsckbc.html man-sys-htmlman html -./usr/share/man/html4/hp700/harmony.html man-sys-htmlman html -./usr/share/man/html4/hp700/intro.html man-sys-htmlman html -./usr/share/man/html4/hp700/io.html man-sys-htmlman html -./usr/share/man/html4/hp700/lasi.html man-sys-htmlman html -./usr/share/man/html4/hp700/lcd.html man-sys-htmlman html -./usr/share/man/html4/hp700/mem.html man-sys-htmlman html -./usr/share/man/html4/hp700/mongoose.html man-sys-htmlman html -./usr/share/man/html4/hp700/pdc.html man-sys-htmlman html -./usr/share/man/html4/hp700/phantomas.html man-sys-htmlman html -./usr/share/man/html4/hp700/ssio.html man-sys-htmlman html -./usr/share/man/html4/hp700/uturn.html man-sys-htmlman html -./usr/share/man/html4/hp700/wax.html man-sys-htmlman html ./usr/share/man/html4/hpacel.html man-sys-htmlman html ./usr/share/man/html4/hpcarm/intro.html man-sys-htmlman html ./usr/share/man/html4/hpcarm/j720kbd.html man-sys-htmlman html @@ -4168,6 +4149,25 @@ ./usr/share/man/html4/hpcsh/j6x0tp.html man-sys-htmlman html ./usr/share/man/html4/hpcsh/psh3lcd.html man-sys-htmlman html ./usr/share/man/html4/hpcsh/psh3tp.html man-sys-htmlman html +./usr/share/man/html4/hppa/asp.html man-sys-htmlman html +./usr/share/man/html4/hppa/astro.html man-sys-htmlman html +./usr/share/man/html4/hppa/cpu.html man-sys-htmlman html +./usr/share/man/html4/hppa/dino.html man-sys-htmlman html +./usr/share/man/html4/hppa/elroy.html man-sys-htmlman html +./usr/share/man/html4/hppa/gsc.html man-sys-htmlman html +./usr/share/man/html4/hppa/gsckbc.html man-sys-htmlman html +./usr/share/man/html4/hppa/harmony.html man-sys-htmlman html +./usr/share/man/html4/hppa/intro.html man-sys-htmlman html +./usr/share/man/html4/hppa/io.html man-sys-htmlman html +./usr/share/man/html4/hppa/lasi.html man-sys-htmlman html +./usr/share/man/html4/hppa/lcd.html man-sys-htmlman html +./usr/share/man/html4/hppa/mem.html man-sys-htmlman html +./usr/share/man/html4/hppa/mongoose.html man-sys-htmlman html +./usr/share/man/html4/hppa/pdc.html man-sys-htmlman html +./usr/share/man/html4/hppa/phantomas.html man-sys-htmlman html +./usr/share/man/html4/hppa/ssio.html man-sys-htmlman html +./usr/share/man/html4/hppa/uturn.html man-sys-htmlman html +./usr/share/man/html4/hppa/wax.html man-sys-htmlman html ./usr/share/man/html4/hpqlb.html man-sys-htmlman html ./usr/share/man/html4/hptide.html man-sys-htmlman html ./usr/share/man/html4/i386/PCIBIOS.html man-sys-htmlman html @@ -5286,13 +5286,13 @@ ./usr/share/man/html8/hp300/boot.html man-sys-htmlman html ./usr/share/man/html8/hp300/crash.html man-sys-htmlman html ./usr/share/man/html8/hp300/format.html man-sys-htmlman html -./usr/share/man/html8/hp700/boot.html man-sys-htmlman html -./usr/share/man/html8/hp700/mkboot.html man-sys-htmlman html ./usr/share/man/html8/hpcarm/boot.html man-sys-htmlman html ./usr/share/man/html8/hpcboot.html man-sys-htmlman html ./usr/share/man/html8/hpcmips/boot.html man-sys-htmlman html ./usr/share/man/html8/hpcmips/pbsdboot.html man-sys-htmlman html ./usr/share/man/html8/hpcsh/boot.html man-sys-htmlman html +./usr/share/man/html8/hppa/boot.html man-sys-htmlman html +./usr/share/man/html8/hppa/mkboot.html man-sys-htmlman html ./usr/share/man/html8/hprop.html man-krb5-htmlman kerberos,html ./usr/share/man/html8/hpropd.html man-krb5-htmlman kerberos,html ./usr/share/man/html8/httpd.html man-netutil-htmlman html @@ -6927,25 +6927,6 @@ ./usr/share/man/man4/hp300/rtc.4 man-sys-man .man ./usr/share/man/man4/hp300/tc.4 man-obsolete obsolete ./usr/share/man/man4/hp300/topcat.4 man-sys-man .man -./usr/share/man/man4/hp700/asp.4 man-sys-man .man -./usr/share/man/man4/hp700/astro.4 man-sys-man .man -./usr/share/man/man4/hp700/cpu.4 man-sys-man .man -./usr/share/man/man4/hp700/dino.4 man-sys-man .man -./usr/share/man/man4/hp700/elroy.4 man-sys-man .man -./usr/share/man/man4/hp700/gsc.4 man-sys-man .man -./usr/share/man/man4/hp700/gsckbc.4 man-sys-man .man -./usr/share/man/man4/hp700/harmony.4 man-sys-man .man -./usr/share/man/man4/hp700/intro.4 man-sys-man .man -./usr/share/man/man4/hp700/io.4 man-sys-man .man -./usr/share/man/man4/hp700/lasi.4 man-sys-man .man -./usr/share/man/man4/hp700/lcd.4 man-sys-man .man -./usr/share/man/man4/hp700/mem.4 man-sys-man .man -./usr/share/man/man4/hp700/mongoose.4 man-sys-man .man -./usr/share/man/man4/hp700/pdc.4 man-sys-man .man -./usr/share/man/man4/hp700/phantomas.4 man-sys-man .man -./usr/share/man/man4/hp700/ssio.4 man-sys-man .man -./usr/share/man/man4/hp700/uturn.4 man-sys-man .man -./usr/share/man/man4/hp700/wax.4 man-sys-man .man ./usr/share/man/man4/hpacel.4 man-sys-man .man ./usr/share/man/man4/hpcarm/intro.4 man-sys-man .man ./usr/share/man/man4/hpcarm/j720kbd.4 man-sys-man .man @@ -6957,6 +6938,25 @@ ./usr/share/man/man4/hpcsh/j6x0tp.4 man-sys-man .man ./usr/share/man/man4/hpcsh/psh3lcd.4 man-sys-man .man ./usr/share/man/man4/hpcsh/psh3tp.4 man-sys-man .man +./usr/share/man/man4/hppa/asp.4 man-sys-man .man +./usr/share/man/man4/hppa/astro.4 man-sys-man .man +./usr/share/man/man4/hppa/cpu.4 man-sys-man .man +./usr/share/man/man4/hppa/dino.4 man-sys-man .man +./usr/share/man/man4/hppa/elroy.4 man-sys-man .man +./usr/share/man/man4/hppa/gsc.4 man-sys-man .man +./usr/share/man/man4/hppa/gsckbc.4 man-sys-man .man +./usr/share/man/man4/hppa/harmony.4 man-sys-man .man +./usr/share/man/man4/hppa/intro.4 man-sys-man .man +./usr/share/man/man4/hppa/io.4 man-sys-man .man +./usr/share/man/man4/hppa/lasi.4 man-sys-man .man +./usr/share/man/man4/hppa/lcd.4 man-sys-man .man +./usr/share/man/man4/hppa/mem.4 man-sys-man .man +./usr/share/man/man4/hppa/mongoose.4 man-sys-man .man +./usr/share/man/man4/hppa/pdc.4 man-sys-man .man +./usr/share/man/man4/hppa/phantomas.4 man-sys-man .man +./usr/share/man/man4/hppa/ssio.4 man-sys-man .man +./usr/share/man/man4/hppa/uturn.4 man-sys-man .man +./usr/share/man/man4/hppa/wax.4 man-sys-man .man ./usr/share/man/man4/hpqlb.4 man-sys-man .man ./usr/share/man/man4/hptide.4 man-sys-man .man ./usr/share/man/man4/i386/PCIBIOS.4 man-sys-man .man @@ -8229,10 +8229,6 @@ ./usr/share/man/man8/hp300/crash.8 man-sys-man .man ./usr/share/man/man8/hp300/format.8 man-sys-man .man ./usr/share/man/man8/hp300/makedev.8 man-obsolete obsolete -./usr/share/man/man8/hp700/MAKEDEV.8 man-obsolete obsolete -./usr/share/man/man8/hp700/boot.8 man-sys-man .man -./usr/share/man/man8/hp700/makedev.8 man-obsolete obsolete -./usr/share/man/man8/hp700/mkboot.8 man-sys-man .man ./usr/share/man/man8/hpcarm/MAKEDEV.8 man-obsolete obsolete ./usr/share/man/man8/hpcarm/boot.8 man-sys-man .man ./usr/share/man/man8/hpcarm/makedev.8 man-obsolete obsolete @@ -8244,6 +8240,10 @@ ./usr/share/man/man8/hpcsh/MAKEDEV.8 man-obsolete obsolete ./usr/share/man/man8/hpcsh/boot.8 man-sys-man .man ./usr/share/man/man8/hpcsh/makedev.8 man-obsolete obsolete +./usr/share/man/man8/hppa/MAKEDEV.8 man-obsolete obsolete +./usr/share/man/man8/hppa/boot.8 man-sys-man .man +./usr/share/man/man8/hppa/makedev.8 man-obsolete obsolete +./usr/share/man/man8/hppa/mkboot.8 man-sys-man .man ./usr/share/man/man8/hprop.8 man-krb5-man kerberos,.man ./usr/share/man/man8/hpropd.8 man-krb5-man kerberos,.man ./usr/share/man/man8/htable.8 man-obsolete obsolete diff --git a/distrib/sets/lists/modules/ad.hppa b/distrib/sets/lists/modules/md.hppa index a37860260c8..ae338c615c6 100644 --- a/distrib/sets/lists/modules/ad.hppa +++ b/distrib/sets/lists/modules/md.hppa @@ -1,3 +1,3 @@ -# $NetBSD: ad.hppa,v 1.1 2009/09/07 02:27:29 jnemeth Exp $ +# $NetBSD: md.hppa,v 1.1 2014/02/24 07:23:39 skrll Exp $ ./@MODULEDIR@/exec_elf32 base-kernel-modules kmod ./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod diff --git a/distrib/utils/sysinst/Makefile b/distrib/utils/sysinst/Makefile index bb76e87dda6..0c0ad31f5aa 100644 --- a/distrib/utils/sysinst/Makefile +++ b/distrib/utils/sysinst/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2011/01/26 01:18:46 pooka Exp $ +# $NetBSD: Makefile,v 1.17 2014/02/24 07:23:39 skrll Exp $ # # sysinst is usually built when the crunched install binary is built, # but can be built here as a normal program for testing. @@ -23,10 +23,10 @@ SUBDIR += arch/evbmips SUBDIR += arch/evbppc SUBDIR += arch/ews4800mips SUBDIR += arch/hp300 -SUBDIR += arch/hp700 SUBDIR += arch/hpcarm SUBDIR += arch/hpcmips SUBDIR += arch/hpcsh +SUBDIR += arch/hppa SUBDIR += arch/i386 SUBDIR += arch/landisk SUBDIR += arch/mac68k diff --git a/distrib/utils/sysinst/arch/hp700/Makefile b/distrib/utils/sysinst/arch/hp700/Makefile deleted file mode 100644 index 17d19e4f937..00000000000 --- a/distrib/utils/sysinst/arch/hp700/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: Makefile,v 1.1 2005/05/14 14:54:00 chs Exp $ -# -# Makefile for hp700 -# - -.include "../../Makefile.inc" diff --git a/distrib/utils/sysinst/arch/hppa/Makefile b/distrib/utils/sysinst/arch/hppa/Makefile new file mode 100644 index 00000000000..8011de378a3 --- /dev/null +++ b/distrib/utils/sysinst/arch/hppa/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:39 skrll Exp $ +# +# Makefile for hppa +# + +.include "../../Makefile.inc" diff --git a/distrib/utils/sysinst/arch/hp700/md.c b/distrib/utils/sysinst/arch/hppa/md.c index ef52b1191cf..2b29bb6c066 100644 --- a/distrib/utils/sysinst/arch/hp700/md.c +++ b/distrib/utils/sysinst/arch/hppa/md.c @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.14 2012/01/09 11:51:41 skrll Exp $ */ +/* $NetBSD: md.c,v 1.1 2014/02/24 07:23:39 skrll Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -32,7 +32,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -/* md.c -- hp700 machine specific routines */ +/* md.c -- hppa machine specific routines */ /* This file is in close sync with pmax, vax, and x68k, sparc md.c */ #include <sys/types.h> @@ -108,7 +108,7 @@ md_get_info(void) dlsize = disklabel.d_secperunit; /* - * hp700 PDC can only address up to 2GB. + * hppa PDC can only address up to 2GB. */ root_limit = HP700_PDC_LIMIT / (unsigned)sectorsize; diff --git a/distrib/utils/sysinst/arch/hp700/md.h b/distrib/utils/sysinst/arch/hppa/md.h index 476b2d04793..a2a697b3b17 100644 --- a/distrib/utils/sysinst/arch/hp700/md.h +++ b/distrib/utils/sysinst/arch/hppa/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.5 2011/04/04 08:30:28 mbalmer Exp $ */ +/* $NetBSD: md.h,v 1.1 2014/02/24 07:23:39 skrll Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -33,7 +33,7 @@ * */ -/* md.h -- Machine specific definitions for the hp700 */ +/* md.h -- Machine specific definitions for the hppa */ /* Constants and defines */ diff --git a/distrib/utils/sysinst/arch/hp700/menus.md.en b/distrib/utils/sysinst/arch/hppa/menus.md.en index eaa0d13f978..6b4abb75b97 100644 --- a/distrib/utils/sysinst/arch/hp700/menus.md.en +++ b/distrib/utils/sysinst/arch/hppa/menus.md.en @@ -1,4 +1,4 @@ -/* $NetBSD: menus.md.en,v 1.2 2011/04/04 08:30:29 mbalmer Exp $ */ +/* $NetBSD: menus.md.en,v 1.1 2014/02/24 07:23:39 skrll Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -33,5 +33,5 @@ * */ -/* hp700 machine dependent menus, english */ +/* hppa machine dependent menus, english */ diff --git a/distrib/utils/sysinst/arch/hp700/menus.md.es b/distrib/utils/sysinst/arch/hppa/menus.md.es index e15c0f4b5d7..9658f6168fa 100644 --- a/distrib/utils/sysinst/arch/hp700/menus.md.es +++ b/distrib/utils/sysinst/arch/hppa/menus.md.es @@ -1,4 +1,4 @@ -/* $NetBSD: menus.md.es,v 1.2 2011/04/04 08:30:29 mbalmer Exp $ */ +/* $NetBSD: menus.md.es,v 1.1 2014/02/24 07:23:39 skrll Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -33,5 +33,5 @@ * */ -/* hp700 machine dependent menus, spanish */ +/* hppa machine dependent menus, spanish */ diff --git a/distrib/utils/sysinst/arch/hp700/menus.md.fr b/distrib/utils/sysinst/arch/hppa/menus.md.fr index 56166556805..b7b550193e6 100644 --- a/distrib/utils/sysinst/arch/hp700/menus.md.fr +++ b/distrib/utils/sysinst/arch/hppa/menus.md.fr @@ -1,4 +1,4 @@ -/* $NetBSD: menus.md.fr,v 1.2 2011/04/04 08:30:29 mbalmer Exp $ */ +/* $NetBSD: menus.md.fr,v 1.1 2014/02/24 07:23:39 skrll Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -33,5 +33,5 @@ * */ -/* hp700 machine dependent menus, french */ +/* hppa machine dependent menus, french */ diff --git a/distrib/utils/sysinst/arch/hp700/menus.md.pl b/distrib/utils/sysinst/arch/hppa/menus.md.pl index 1e893167dfc..eb98089d240 100644 --- a/distrib/utils/sysinst/arch/hp700/menus.md.pl +++ b/distrib/utils/sysinst/arch/hppa/menus.md.pl @@ -1,4 +1,4 @@ -/* $NetBSD: menus.md.pl,v 1.2 2011/04/04 08:30:29 mbalmer Exp $ */ +/* $NetBSD: menus.md.pl,v 1.1 2014/02/24 07:23:39 skrll Exp $ */ /* Based on english version: */ /* NetBSD: menus.md.en,v 1.5 2001/11/29 32:21:02 thorpej Exp */ @@ -35,5 +35,5 @@ * */ -/* hp700 machine dependent menus, Polish */ +/* hppa machine dependent menus, Polish */ diff --git a/distrib/utils/sysinst/arch/hp700/msg.md.de b/distrib/utils/sysinst/arch/hppa/msg.md.de index 0e6bc2c1494..62bbee7755e 100644 --- a/distrib/utils/sysinst/arch/hp700/msg.md.de +++ b/distrib/utils/sysinst/arch/hppa/msg.md.de @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.de,v 1.6 2012/01/09 11:51:41 skrll Exp $ */ +/* $NetBSD: msg.md.de,v 1.1 2014/02/24 07:23:39 skrll Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -33,7 +33,7 @@ * */ -/* hp700 machine dependent messages, German */ +/* hppa machine dependent messages, German */ message md_hello diff --git a/distrib/utils/sysinst/arch/hp700/msg.md.en b/distrib/utils/sysinst/arch/hppa/msg.md.en index 83d90202924..93cf9b456e8 100644 --- a/distrib/utils/sysinst/arch/hp700/msg.md.en +++ b/distrib/utils/sysinst/arch/hppa/msg.md.en @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.en,v 1.6 2012/01/09 11:51:41 skrll Exp $ */ +/* $NetBSD: msg.md.en,v 1.1 2014/02/24 07:23:39 skrll Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -33,7 +33,7 @@ * */ -/* hp700 machine dependent messages, english */ +/* hppa machine dependent messages, english */ message md_hello diff --git a/distrib/utils/sysinst/arch/hp700/msg.md.es b/distrib/utils/sysinst/arch/hppa/msg.md.es index 94c5c0357bc..d465d32bd72 100644 --- a/distrib/utils/sysinst/arch/hp700/msg.md.es +++ b/distrib/utils/sysinst/arch/hppa/msg.md.es @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.es,v 1.6 2012/01/09 11:51:41 skrll Exp $ */ +/* $NetBSD: msg.md.es,v 1.1 2014/02/24 07:23:39 skrll Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -33,7 +33,7 @@ * */ -/* hp700 machine dependent messages, english */ +/* hppa machine dependent messages, english */ message md_hello diff --git a/distrib/utils/sysinst/arch/hp700/msg.md.fr b/distrib/utils/sysinst/arch/hppa/msg.md.fr index 38169d92562..e8969861543 100644 --- a/distrib/utils/sysinst/arch/hp700/msg.md.fr +++ b/distrib/utils/sysinst/arch/hppa/msg.md.fr @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.fr,v 1.7 2012/01/09 11:51:41 skrll Exp $ */ +/* $NetBSD: msg.md.fr,v 1.1 2014/02/24 07:23:39 skrll Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -33,7 +33,7 @@ * */ -/* hp700 machine dependent messages, french */ +/* hppa machine dependent messages, french */ message md_hello diff --git a/distrib/utils/sysinst/arch/hp700/msg.md.pl b/distrib/utils/sysinst/arch/hppa/msg.md.pl index eb6717e6621..bf96a5f13d6 100644 --- a/distrib/utils/sysinst/arch/hp700/msg.md.pl +++ b/distrib/utils/sysinst/arch/hppa/msg.md.pl @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.pl,v 1.6 2012/01/09 11:51:41 skrll Exp $ */ +/* $NetBSD: msg.md.pl,v 1.1 2014/02/24 07:23:39 skrll Exp $ */ /* Based on english version: */ /* NetBSD: msg.md.en,v 1.2 2002/12/03 01:54:49 minoura Exp */ @@ -35,7 +35,7 @@ * */ -/* hp700 machine dependent messages, Polish */ +/* hppa machine dependent messages, Polish */ message md_hello diff --git a/doc/RESPONSIBLE b/doc/RESPONSIBLE index b066cfa3ecb..b398036377a 100644 --- a/doc/RESPONSIBLE +++ b/doc/RESPONSIBLE @@ -1,4 +1,4 @@ -# $NetBSD: RESPONSIBLE,v 1.106 2012/12/05 17:21:55 dholland Exp $ +# $NetBSD: RESPONSIBLE,v 1.107 2014/02/24 07:23:40 skrll Exp $ List of sections of the system, and who is responsible for them (or at least considered an expert on them). @@ -275,10 +275,10 @@ evbppc scw evbsh3 core ews4800mips tsutsui hp300 tsutsui -hp700 skrll hpcarm core hpcmips core hpcsh uwe +hppa skrll i386 dsl ibmnws matt iyonix gavan diff --git a/etc/etc.hp700/sysctl.conf b/etc/etc.hp700/sysctl.conf deleted file mode 100644 index e69de29bb2d..00000000000 --- a/etc/etc.hp700/sysctl.conf +++ /dev/null diff --git a/etc/etc.hp700/MAKEDEV.conf b/etc/etc.hppa/MAKEDEV.conf index eaa6af47e0c..9a244a21f59 100644 --- a/etc/etc.hp700/MAKEDEV.conf +++ b/etc/etc.hppa/MAKEDEV.conf @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.7 2012/01/07 16:12:30 skrll Exp $ +# $NetBSD: MAKEDEV.conf,v 1.1 2014/02/24 07:23:40 skrll Exp $ all_md) makedev wscons diff --git a/etc/etc.hp700/Makefile.inc b/etc/etc.hppa/Makefile.inc index 270d3d14edb..677c87973fb 100644 --- a/etc/etc.hp700/Makefile.inc +++ b/etc/etc.hppa/Makefile.inc @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.inc,v 1.6 2012/05/23 08:19:40 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.1 2014/02/24 07:23:40 skrll Exp $ # -# etc.hp700/Makefile.inc -- hp700-specific etc Makefile targets +# etc.hppa/Makefile.inc -- hppa-specific etc Makefile targets # # If you change the list of distributed kernels, don't forget diff --git a/etc/etc.hp700/ttys b/etc/etc.hppa/ttys index 1e2e2e45ae5..d0f46327558 100644 --- a/etc/etc.hp700/ttys +++ b/etc/etc.hppa/ttys @@ -1,4 +1,4 @@ -# $NetBSD: ttys,v 1.4 2008/10/07 10:00:01 abs Exp $ +# $NetBSD: ttys,v 1.1 2014/02/24 07:23:40 skrll Exp $ # # $OpenBSD: ttys,v 1.1 1999/11/30 21:25:39 mickey Exp $ # diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base index 33a5966bf5c..6149eeb5704 100644 --- a/etc/mtree/NetBSD.dist.base +++ b/etc/mtree/NetBSD.dist.base @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.133 2014/01/23 07:26:50 spz Exp $ +# $NetBSD: NetBSD.dist.base,v 1.134 2014/02/24 07:23:40 skrll Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -884,10 +884,10 @@ ./usr/share/man/cat4/evbmips ./usr/share/man/cat4/evbppc ./usr/share/man/cat4/hp300 -./usr/share/man/cat4/hp700 ./usr/share/man/cat4/hpcarm ./usr/share/man/cat4/hpcmips ./usr/share/man/cat4/hpcsh +./usr/share/man/cat4/hppa ./usr/share/man/cat4/i386 ./usr/share/man/cat4/mac68k ./usr/share/man/cat4/macppc @@ -926,10 +926,10 @@ ./usr/share/man/cat8/evbppc ./usr/share/man/cat8/evbsh3 ./usr/share/man/cat8/hp300 -./usr/share/man/cat8/hp700 ./usr/share/man/cat8/hpcarm ./usr/share/man/cat8/hpcmips ./usr/share/man/cat8/hpcsh +./usr/share/man/cat8/hppa ./usr/share/man/cat8/i386 ./usr/share/man/cat8/ibmnws ./usr/share/man/cat8/luna68k @@ -995,10 +995,10 @@ ./usr/share/man/html4/evbmips ./usr/share/man/html4/evbppc ./usr/share/man/html4/hp300 -./usr/share/man/html4/hp700 ./usr/share/man/html4/hpcarm ./usr/share/man/html4/hpcmips ./usr/share/man/html4/hpcsh +./usr/share/man/html4/hppa ./usr/share/man/html4/i386 ./usr/share/man/html4/mac68k ./usr/share/man/html4/macppc @@ -1037,10 +1037,10 @@ ./usr/share/man/html8/evbppc ./usr/share/man/html8/evbsh3 ./usr/share/man/html8/hp300 -./usr/share/man/html8/hp700 ./usr/share/man/html8/hpcarm ./usr/share/man/html8/hpcmips ./usr/share/man/html8/hpcsh +./usr/share/man/html8/hppa ./usr/share/man/html8/i386 ./usr/share/man/html8/ibmnws ./usr/share/man/html8/luna68k @@ -1106,10 +1106,10 @@ ./usr/share/man/man4/evbmips ./usr/share/man/man4/evbppc ./usr/share/man/man4/hp300 -./usr/share/man/man4/hp700 ./usr/share/man/man4/hpcarm ./usr/share/man/man4/hpcmips ./usr/share/man/man4/hpcsh +./usr/share/man/man4/hppa ./usr/share/man/man4/i386 ./usr/share/man/man4/mac68k ./usr/share/man/man4/macppc @@ -1148,10 +1148,10 @@ ./usr/share/man/man8/evbppc ./usr/share/man/man8/evbsh3 ./usr/share/man/man8/hp300 -./usr/share/man/man8/hp700 ./usr/share/man/man8/hpcarm ./usr/share/man/man8/hpcmips ./usr/share/man/man8/hpcsh +./usr/share/man/man8/hppa ./usr/share/man/man8/i386 ./usr/share/man/man8/ibmnws ./usr/share/man/man8/luna68k diff --git a/external/bsd/mdocml/dist/arch.in b/external/bsd/mdocml/dist/arch.in index bb258fe7b2f..a6c97bf5dc3 100644 --- a/external/bsd/mdocml/dist/arch.in +++ b/external/bsd/mdocml/dist/arch.in @@ -53,7 +53,6 @@ LINE("evbppc", "evbPPC") LINE("evbsh3", "evbSH3") LINE("ews4800mips", "EWS4800MIPS") LINE("hp300", "HP300") -LINE("hp700", "HP700") LINE("hpcarm", "HPCARM") LINE("hpcmips", "HPCMIPS") LINE("hpcsh", "HPCSH") diff --git a/external/mit/xorg/bin/xdm/config/Makefile b/external/mit/xorg/bin/xdm/config/Makefile index 4a9d803eacc..1aaa0dc4c7b 100644 --- a/external/mit/xorg/bin/xdm/config/Makefile +++ b/external/mit/xorg/bin/xdm/config/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/02/21 08:20:19 martin Exp $ +# $NetBSD: Makefile,v 1.14 2014/02/24 07:23:40 skrll Exp $ .include <bsd.own.mk> @@ -7,9 +7,9 @@ # WSDISPLAY_COMPAT_PCVT, this might change soon) .if ${MACHINE_ARCH} == "x86_64" \ || ${MACHINE_ARCH} == "cats" \ - || ${MACHINE_ARCH} == "hp700" \ || ${MACHINE_ARCH} == "hpcmips" \ || ${MACHINE_ARCH} == "hpcsh" \ + || ${MACHINE_ARCH} == "hppa" \ || ${MACHINE_ARCH} == "i386" \ || ${MACHINE_ARCH} == "netwinder" \ || ${MACHINE_ARCH} == "shark" \ diff --git a/gnu/dist/groff/tmac/doc-common b/gnu/dist/groff/tmac/doc-common index 8f3fffb244f..1e813ff4d5d 100644 --- a/gnu/dist/groff/tmac/doc-common +++ b/gnu/dist/groff/tmac/doc-common @@ -276,10 +276,10 @@ .ds doc-volume-as-evbppc evbppc .ds doc-volume-as-evbsh3 evbsh3 .ds doc-volume-as-hp300 hp300 -.ds doc-volume-as-hp700 hp700 .ds doc-volume-as-hpcarm hpcarm .ds doc-volume-as-hpcmips hpcmips .ds doc-volume-as-hpcsh hpcsh +.ds doc-volume-as-hppa hppa .ds doc-volume-as-i386 i386 .ds doc-volume-as-luna68k luna68k .ds doc-volume-as-m68k m68k diff --git a/gnu/dist/groff/tmac/groff_mdoc.man b/gnu/dist/groff/tmac/groff_mdoc.man index 6fc6b21d5a8..7d998596545 100644 --- a/gnu/dist/groff/tmac/groff_mdoc.man +++ b/gnu/dist/groff/tmac/groff_mdoc.man @@ -771,7 +771,7 @@ By default, the following architecture keywords are defined: .Bd -ragged -offset indent .No alpha , acorn26 , acorn32 , algor , amd64 , amiga , arc , arm26 , .No arm32 , atari , bebox , cats , cesfic , cobalt , dreamcast , evbarm , -.No evbmips , evbppc , evbsh3 , hp300 , hp700 , hpcmips , i386 , luna68k , +.No evbmips , evbppc , evbsh3 , hp300 , hpcmips , hppa , i386 , luna68k , .No m68k , mac68k , macppc , mips , mmeye , mvme68k , mvmeppc , netwinder , .No news68k , newsmips , next68k , ofppc , pc532 , pmax , pmppc , powerpc , .No prep , sandpoint , sgimips , sh3 , shark , sparc , sparc64 , sun3 , diff --git a/gnu/usr.bin/send-pr/categories b/gnu/usr.bin/send-pr/categories index dac88655796..b82d8a7a996 100644 --- a/gnu/usr.bin/send-pr/categories +++ b/gnu/usr.bin/send-pr/categories @@ -25,7 +25,6 @@ port-evbmips port-evbppc port-evbsh3 port-hp300 -port-hp700 port-hpcarm port-hpcmips port-hpcsh diff --git a/sbin/disklabel/main.c b/sbin/disklabel/main.c index 9a3eeddedeb..bcea312feb9 100644 --- a/sbin/disklabel/main.c +++ b/sbin/disklabel/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.37 2013/08/22 00:26:23 matt Exp $ */ +/* $NetBSD: main.c,v 1.38 2014/02/24 07:23:40 skrll Exp $ */ /* * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -76,7 +76,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\ static char sccsid[] = "@(#)disklabel.c 8.4 (Berkeley) 5/4/95"; /* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */ #else -__RCSID("$NetBSD: main.c,v 1.37 2013/08/22 00:26:23 matt Exp $"); +__RCSID("$NetBSD: main.c,v 1.38 2014/02/24 07:23:40 skrll Exp $"); #endif #endif /* not lint */ @@ -239,7 +239,7 @@ static const struct disklabel_params { { "bebox", 0, 1, 0, 8, 3, 0, BIG_ENDIAN }, /* powerpc */ { "emips", 0, 1, 0, 16, 2, 0, BIG_ENDIAN }, /* mips */ - { "hp700", 0, 1, 0, 16, 2, 0, BIG_ENDIAN }, /* hppa */ + { "hppa", 0, 1, 0, 16, 2, 0, BIG_ENDIAN }, /* hppa */ { "ibmnws", 0, 1, 0, 16, 2, 0, BIG_ENDIAN }, /* powerpc */ { "ofppc", 0, 1, 0, 16, 2, 0, BIG_ENDIAN }, /* powerpc */ { "rs6000", 0, 1, 0, 16, 2, 0, BIG_ENDIAN }, /* powerpc */ diff --git a/share/man/man0/intros b/share/man/man0/intros index 6c2870cc7f5..4e81af30993 100644 --- a/share/man/man0/intros +++ b/share/man/man0/intros @@ -11,8 +11,8 @@ ../man4/man4.emips/intro.4 ../man4/man4.evbarm/intro.4 ../man4/man4.hp300/intro.4 -../man4/man4.hp700/intro.4 ../man4/man4.hpcsh/intro.4 +../man4/man4.hppa/intro.4 ../man4/man4.i386/intro.4 ../man4/man4.mac68k/intro.4 ../man4/man4.macppc/intro.4 diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 90616e5a949..0b04285eb17 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.607 2014/01/21 16:12:56 mlelstv Exp $ +# $NetBSD: Makefile,v 1.608 2014/02/24 07:23:40 skrll Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -243,7 +243,7 @@ MLINKS+=edc.4 i386/ed.4 SUBDIR= man4.acorn26 man4.acorn32 man4.alpha man4.amiga man4.arc man4.atari \ man4.cobalt man4.dreamcast man4.emips man4.evbarm man4.evbmips \ man4.evbppc \ - man4.hp300 man4.hp700 man4.hpcarm man4.hpcmips man4.hpcsh man4.i386 \ + man4.hp300 man4.hpcarm man4.hpcmips man4.hpcsh man4.hppa man4.i386 \ man4.mac68k man4.macppc man4.mvme68k man4.pmax man4.prep \ man4.sandpoint man4.sgimips man4.sparc man4.sparc64 man4.sun2 \ man4.sun3 man4.vax man4.x68k man4.x86 diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index d3cffb95eec..e76e103f025 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: ddb.4,v 1.154 2013/05/15 05:22:43 msaitoh Exp $ +.\" $NetBSD: ddb.4,v 1.155 2014/02/24 07:23:40 skrll Exp $ .\" .\" Copyright (c) 1997 - 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -119,19 +119,19 @@ from the keyboard: \*[Lt]Alt\*[Gt]-\*[Lt]LeftShift\*[Gt]-\*[Lt]F9\*[Gt] .It hp300 \*[Lt]Shift\*[Gt]-\*[Lt]Reset\*[Gt] -.It hp700 -\*[Lt]Ctrl\*[Gt]-\*[Lt]Alt\*[Gt]-\*[Lt]Esc\*[Gt] on PC style keyboards. -.It "" -+++++ -(five plus signs) on PDC console -.It "" -\*[Lt]Break\*[Gt] on serial console. .It hpcarm \*[Lt]Ctrl\*[Gt]-\*[Lt]Alt\*[Gt]-\*[Lt]Esc\*[Gt] .It hpcmips \*[Lt]Ctrl\*[Gt]-\*[Lt]Alt\*[Gt]-\*[Lt]Esc\*[Gt] .It hpcsh \*[Lt]Ctrl\*[Gt]-\*[Lt]Alt\*[Gt]-\*[Lt]Esc\*[Gt] +.It hppa +\*[Lt]Ctrl\*[Gt]-\*[Lt]Alt\*[Gt]-\*[Lt]Esc\*[Gt] on PC style keyboards. +.It "" ++++++ +(five plus signs) on PDC console +.It "" +\*[Lt]Break\*[Gt] on serial console. .It i386 \*[Lt]Ctrl\*[Gt]-\*[Lt]Alt\*[Gt]-\*[Lt]Esc\*[Gt] .It "" @@ -994,7 +994,7 @@ Switch to another cpu. .It Ic frame Given a trap frame address, print out the trap frame. .El -.Ss HP700 +.Ss HPPA .Bl -tag -width "traptrace" -compact .It Ic frame Without an address the default trap frame is printed. diff --git a/share/man/man4/hil.4 b/share/man/man4/hil.4 index 4598e4349a7..bf2c76b3f9f 100644 --- a/share/man/man4/hil.4 +++ b/share/man/man4/hil.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: hil.4,v 1.1 2011/02/09 15:12:41 tsutsui Exp $ +.\" $NetBSD: hil.4,v 1.2 2014/02/24 07:23:40 skrll Exp $ .\" $OpenBSD: hil.4,v 1.10 2007/05/31 19:19:50 jmc Exp $ .\" .\" Copyright (c) 2003 Miodrag Vallat. @@ -34,7 +34,7 @@ .Sh SYNOPSIS .Ss hp300 .Cd "hil* at intio?" -.\".Ss hp700 +.\".Ss hppa .\".Cd "hil* at gsc? irq 1" .Pp .Cd "hilkbd* at hil?" diff --git a/share/man/man4/iee.4 b/share/man/man4/iee.4 index 2c8928aa5f0..a43cf3e62da 100644 --- a/share/man/man4/iee.4 +++ b/share/man/man4/iee.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: iee.4,v 1.7 2013/12/09 09:35:16 wiz Exp $ +.\" $NetBSD: iee.4,v 1.8 2014/02/24 07:23:40 skrll Exp $ .\" Copyright (c) 2002 Jochen Kunz. .\" All rights reserved. .\" @@ -39,7 +39,7 @@ interface .Sh SYNOPSIS .Ss ews4800mips .Cd iee* at sbdio? -.Ss hp700 +.Ss hppa .Cd iee* at gsc? .Sh DESCRIPTION The @@ -70,7 +70,7 @@ interface supports .Tn Intel .Tn i82596CA based on-board Ethernet on EWS4800/350. -.Ss hp700 +.Ss hppa The .Nm interface supports @@ -80,7 +80,7 @@ on ASP/ASP2 based machines and the .Tn i82596CA macrocell in LASI based machines. GSC expansion cards may work, but are not tested. -Media selection on hp700 is done either manually via hardware +Media selection on hppa is done either manually via hardware jumper or automatically depending on machine model. .Sh DIAGNOSTICS .Bl -diag diff --git a/share/man/man4/man4.hp700/Makefile b/share/man/man4/man4.hppa/Makefile index 4613298852e..08937c502ce 100644 --- a/share/man/man4/man4.hp700/Makefile +++ b/share/man/man4/man4.hppa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/06/24 16:37:49 skrll Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:40 skrll Exp $ # from: @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= asp.4 astro.4 cpu.4 dino.4 elroy.4 gsc.4 gsckbc.4 harmony.4 intro.4 \ @@ -6,6 +6,6 @@ MAN= asp.4 astro.4 cpu.4 dino.4 elroy.4 gsc.4 gsckbc.4 harmony.4 intro.4 \ USETBL= -MANSUBDIR=/hp700 +MANSUBDIR=/hppa .include <bsd.man.mk> diff --git a/share/man/man4/man4.hp700/asp.4 b/share/man/man4/man4.hppa/asp.4 index 248db5a7d84..1581cbc984b 100644 --- a/share/man/man4/man4.hp700/asp.4 +++ b/share/man/man4/man4.hppa/asp.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: asp.4,v 1.2 2010/05/31 09:38:57 skrll Exp $ +.\" $NetBSD: asp.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: asp.4,v 1.15 2003/08/31 20:53:33 jmc Exp $ .\" @@ -26,7 +26,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd April 5, 2008 -.Dt ASP 4 hp700 +.Dt ASP 4 hppa .Os .Sh NAME .Nm asp diff --git a/share/man/man4/man4.hp700/astro.4 b/share/man/man4/man4.hppa/astro.4 index f4441e059ff..7276623a48c 100644 --- a/share/man/man4/man4.hp700/astro.4 +++ b/share/man/man4/man4.hppa/astro.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: astro.4,v 1.2 2010/05/31 18:43:52 wiz Exp $ +.\" $NetBSD: astro.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" OpenBSD: astro.4,v 1.3 2007/05/31 19:19:54 jmc Exp .\" .\" Copyright (c) 2007 Mark Kettenis <kettenis@openbsd.org> @@ -16,7 +16,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd May 31, 2010 -.Dt ASTRO 4 hp700 +.Dt ASTRO 4 hppa .Os .Sh NAME .Nm astro diff --git a/share/man/man4/man4.hp700/cpu.4 b/share/man/man4/man4.hppa/cpu.4 index 7a64337132a..504847e9878 100644 --- a/share/man/man4/man4.hp700/cpu.4 +++ b/share/man/man4/man4.hppa/cpu.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: cpu.4,v 1.5 2013/07/20 21:39:59 wiz Exp $ +.\" $NetBSD: cpu.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: cpu.4tbl,v 1.19 2004/04/08 16:17:09 mickey Exp $ .\" @@ -27,7 +27,7 @@ .\" THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd April 4, 2002 -.Dt CPU 4 hp700 +.Dt CPU 4 hppa .Os .Sh NAME .Nm cpu diff --git a/share/man/man4/man4.hp700/dino.4 b/share/man/man4/man4.hppa/dino.4 index 3e38fbe8086..276f1e38b73 100644 --- a/share/man/man4/man4.hp700/dino.4 +++ b/share/man/man4/man4.hppa/dino.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: dino.4,v 1.1 2004/09/22 16:38:26 jkunz Exp $ +.\" $NetBSD: dino.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: dino.4,v 1.4 2004/02/17 19:30:22 jmc Exp $ .\" @@ -26,7 +26,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd September 29, 2003 -.Dt DINO 4 hp700 +.Dt DINO 4 hppa .Os .Sh NAME .Nm dino diff --git a/share/man/man4/man4.hp700/elroy.4 b/share/man/man4/man4.hppa/elroy.4 index ae341fba4b9..a7437e4b815 100644 --- a/share/man/man4/man4.hp700/elroy.4 +++ b/share/man/man4/man4.hppa/elroy.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: elroy.4,v 1.2 2010/05/31 18:43:00 wiz Exp $ +.\" $NetBSD: elroy.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" OpenBSD: elroy.4,v 1.2 2007/05/31 19:19:54 jmc Exp .\" .\" Copyright (c) 2007 Mark Kettenis <kettenis@openbsd.org> @@ -16,7 +16,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd May 31, 2010 -.Dt ELROY 4 hp700 +.Dt ELROY 4 hppa .Os .Sh NAME .Nm elroy diff --git a/share/man/man4/man4.hp700/gsc.4 b/share/man/man4/man4.hppa/gsc.4 index ea0462be6f5..e39c563b659 100644 --- a/share/man/man4/man4.hp700/gsc.4 +++ b/share/man/man4/man4.hppa/gsc.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: gsc.4,v 1.2 2009/08/08 14:09:06 skrll Exp $ +.\" $NetBSD: gsc.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: gsc.4,v 1.18 2004/03/12 00:04:56 miod Exp $ .\" @@ -27,7 +27,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd April 4, 1999 -.Dt GSC 4 hp700 +.Dt GSC 4 hppa .Os .Sh NAME .Nm gsc diff --git a/share/man/man4/man4.hp700/gsckbc.4 b/share/man/man4/man4.hppa/gsckbc.4 index d33b1b18878..cc5cde22caf 100644 --- a/share/man/man4/man4.hp700/gsckbc.4 +++ b/share/man/man4/man4.hppa/gsckbc.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: gsckbc.4,v 1.2 2009/05/27 19:24:00 snj Exp $ +.\" $NetBSD: gsckbc.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" Copyright (c) 2002 Jochen Kunz. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .Dd August 20, 2004 -.Dt GSCKBC 4 hp700 +.Dt GSCKBC 4 hppa .Os .Sh NAME .Nm gsckbc diff --git a/share/man/man4/man4.hp700/harmony.4 b/share/man/man4/man4.hppa/harmony.4 index 2e57fae649d..6d7c503a54e 100644 --- a/share/man/man4/man4.hp700/harmony.4 +++ b/share/man/man4/man4.hppa/harmony.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: harmony.4,v 1.1 2004/09/22 16:38:26 jkunz Exp $ +.\" $NetBSD: harmony.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: harmony.4,v 1.7 2004/03/15 13:27:48 miod Exp $ .\" @@ -28,7 +28,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd January 26, 2003 -.Dt HARMONY 4 hp700 +.Dt HARMONY 4 hppa .Os .Sh NAME .Nm harmony diff --git a/share/man/man4/man4.hp700/intro.4 b/share/man/man4/man4.hppa/intro.4 index aeecb9f5606..d6ed3b041c0 100644 --- a/share/man/man4/man4.hp700/intro.4 +++ b/share/man/man4/man4.hppa/intro.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: intro.4,v 1.4 2012/03/13 19:25:42 njoly Exp $ +.\" $NetBSD: intro.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: intro.4,v 1.5 2004/04/16 21:23:08 jmc Exp $ .\" @@ -27,7 +27,7 @@ .\" .\" .Dd March 11, 2001 -.Dt INTRO 4 hp700 +.Dt INTRO 4 hppa .Os .Sh NAME .Nm intro @@ -84,7 +84,7 @@ The autoconfiguration system is described in .Xr autoconf 4 . .Sh SUPPORTED SYSTEMS .Nx -hp700 should run on systems similar to those, listed below, +hppa should run on systems similar to those, listed below, as long as they're based upon the following: .Pp .Bl -bullet -compact @@ -278,7 +278,7 @@ implementations for add-on devices. .Pp .Lk http://www.openpa.net/ "PA-RISC Information Resource" .Sh HISTORY -The hp700 +The hppa .Nm first appeared with .Ox 2.0 . diff --git a/share/man/man4/man4.hp700/io.4 b/share/man/man4/man4.hppa/io.4 index 0754032e7b4..dc1dd8c2eb0 100644 --- a/share/man/man4/man4.hp700/io.4 +++ b/share/man/man4/man4.hppa/io.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: io.4,v 1.3 2012/06/02 13:54:49 njoly Exp $ +.\" $NetBSD: io.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: io.4,v 1.8 2004/04/18 00:04:34 mickey Exp $ .\" @@ -27,7 +27,7 @@ .\" .\" .Dd January 15, 2004 -.Dt IO 4 hp700 +.Dt IO 4 hppa .Os .Sh NAME .Nm io @@ -148,7 +148,7 @@ Formac+ FDDI, .Pp .Lk http://www.openpa.net/ "PA-RISC Information Resource" .Sh HISTORY -The hp700 +The hppa .Nm reference first appeared with .Ox 3.3 . diff --git a/share/man/man4/man4.hp700/lasi.4 b/share/man/man4/man4.hppa/lasi.4 index 7d85df0e4fb..704d3d4302e 100644 --- a/share/man/man4/man4.hp700/lasi.4 +++ b/share/man/man4/man4.hppa/lasi.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: lasi.4,v 1.1 2004/09/22 16:38:26 jkunz Exp $ +.\" $NetBSD: lasi.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: lasi.4,v 1.23 2004/04/17 23:54:47 mickey Exp $ .\" @@ -27,7 +27,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd March 1, 1999 -.Dt LASI 4 hp700 +.Dt LASI 4 hppa .Os .Sh NAME .Nm lasi diff --git a/share/man/man4/man4.hp700/lcd.4 b/share/man/man4/man4.hppa/lcd.4 index e6eb5ef9a9e..3e92d75ddbd 100644 --- a/share/man/man4/man4.hp700/lcd.4 +++ b/share/man/man4/man4.hppa/lcd.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: lcd.4,v 1.2 2010/06/01 11:34:02 wiz Exp $ +.\" $NetBSD: lcd.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" OpenBSD: lcd.4,v 1.2 2007/07/20 22:41:57 kettenis Exp .\" .\" Copyright (c) 2007 Mark Kettenis <kettenis@openbsd.org> @@ -16,7 +16,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd June 1, 2010 -.Dt LCD 4 hp700 +.Dt LCD 4 hppa .Os .Sh NAME .Nm lcd diff --git a/share/man/man4/man4.hp700/mem.4 b/share/man/man4/man4.hppa/mem.4 index dbcc4778e7e..f23e800977b 100644 --- a/share/man/man4/man4.hp700/mem.4 +++ b/share/man/man4/man4.hppa/mem.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: mem.4,v 1.1 2004/09/22 16:38:26 jkunz Exp $ +.\" $NetBSD: mem.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: mem.4,v 1.1 2004/03/17 00:42:43 miod Exp $ .\" @@ -26,7 +26,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .Dd March 16, 2004 -.Dt MEM 4 hp700 +.Dt MEM 4 hppa .Os .Sh NAME .Nm mem , @@ -49,7 +49,7 @@ Physical memory is accessed through while kernel virtual memory is accessed through .Pa /dev/kmem . Access to kernel virtual addresses not currently mapped to memory will fail. -On hp700, the physical memory range is always contiguous and starts at +On hppa, the physical memory range is always contiguous and starts at address 0; kernel virtual memory begins at address 0 as well. .Pp The writeability of the diff --git a/share/man/man4/man4.hp700/mongoose.4 b/share/man/man4/man4.hppa/mongoose.4 index fe192cbe753..86291d1b538 100644 --- a/share/man/man4/man4.hp700/mongoose.4 +++ b/share/man/man4/man4.hppa/mongoose.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: mongoose.4,v 1.1 2004/09/22 16:38:26 jkunz Exp $ +.\" $NetBSD: mongoose.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: mongoose.4,v 1.2 2004/06/08 07:55:54 jmc Exp $ .\" @@ -26,7 +26,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd June 8, 2004 -.Dt MONGOOSE 4 hp700 +.Dt MONGOOSE 4 hppa .Os .Sh NAME .Nm mongoose diff --git a/share/man/man4/man4.hp700/pdc.4 b/share/man/man4/man4.hppa/pdc.4 index 553857c4277..5bb1e50ee47 100644 --- a/share/man/man4/man4.hp700/pdc.4 +++ b/share/man/man4/man4.hppa/pdc.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: pdc.4,v 1.6 2009/03/23 16:12:36 joerg Exp $ +.\" $NetBSD: pdc.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: pdc.4,v 1.6 2007/06/01 19:54:10 aanriot Exp $ .\" @@ -27,7 +27,7 @@ .\" THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd June 1, 2007 -.Dt PDC 4 hp700 +.Dt PDC 4 hppa .Os .Sh NAME .Nm pdc @@ -681,10 +681,10 @@ The next two words provide accuracy in parts per billion for the TOD and CPU timer, respectively. .El .Sh FILES -.Bl -tag -width /sys/arch/hp700/dev/cpudevs -compact +.Bl -tag -width /sys/arch/hppa/dev/cpudevs -compact .It machine/pdc.h C header file with relevant definitions. -.It /sys/arch/hp700/dev/cpudevs +.It /sys/arch/hppa/dev/cpudevs System components' version numbers. .It /dev/console System console device. diff --git a/share/man/man4/man4.hp700/phantomas.4 b/share/man/man4/man4.hppa/phantomas.4 index cd7c1fe29b7..c496b8782cf 100644 --- a/share/man/man4/man4.hp700/phantomas.4 +++ b/share/man/man4/man4.hppa/phantomas.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: phantomas.4,v 1.1 2004/09/22 16:38:26 jkunz Exp $ +.\" $NetBSD: phantomas.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: phantomas.4,v 1.6 2003/09/02 21:11:50 jmc Exp $ .\" @@ -26,7 +26,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd December 18, 2002 -.Dt PHANTOMAS 4 hp700 +.Dt PHANTOMAS 4 hppa .Os .Sh NAME .Nm phantomas diff --git a/share/man/man4/man4.hp700/ssio.4 b/share/man/man4/man4.hppa/ssio.4 index 42f2957cb4f..91d183355a9 100644 --- a/share/man/man4/man4.hp700/ssio.4 +++ b/share/man/man4/man4.hppa/ssio.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: ssio.4,v 1.2 2010/05/31 09:42:48 skrll Exp $ +.\" $NetBSD: ssio.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" OpenBSD: ssio.4,v 1.4 2007/07/15 20:00:49 kettenis Exp .\" .\" Copyright (c) 2007 Mark Kettenis <kettenis@openbsd.org> @@ -16,7 +16,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd May 31, 2010 -.Dt SSIO 4 hp700 +.Dt SSIO 4 hppa .Os .Sh NAME .Nm ssio diff --git a/share/man/man4/man4.hp700/uturn.4 b/share/man/man4/man4.hppa/uturn.4 index 2467c984c87..f0b1801b11e 100644 --- a/share/man/man4/man4.hp700/uturn.4 +++ b/share/man/man4/man4.hppa/uturn.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: uturn.4,v 1.2 2012/01/12 23:08:50 skrll Exp $ +.\" $NetBSD: uturn.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" $OpenBSD: uturn.4,v 1.8 2008/04/27 19:33:39 jmc Exp $ .\" .\" Copyright (c) 2004 Michael Shalayeff @@ -25,7 +25,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd January 12, 2012 -.Dt UTURN 4 hp700 +.Dt UTURN 4 hppa .Os .Sh NAME .Nm uturn diff --git a/share/man/man4/man4.hp700/wax.4 b/share/man/man4/man4.hppa/wax.4 index 06874e6f140..291204a5852 100644 --- a/share/man/man4/man4.hp700/wax.4 +++ b/share/man/man4/man4.hppa/wax.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: wax.4,v 1.1 2004/09/22 16:38:26 jkunz Exp $ +.\" $NetBSD: wax.4,v 1.1 2014/02/24 07:23:40 skrll Exp $ .\" .\" $OpenBSD: wax.4,v 1.5 2003/09/02 21:11:50 jmc Exp $ .\" @@ -27,7 +27,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd April 3, 2003 -.Dt WAX 4 hp700 +.Dt WAX 4 hppa .Os .Sh NAME .Nm wax diff --git a/share/man/man4/oosiop.4 b/share/man/man4/oosiop.4 index 83378d62d4a..f1b9a6d3ee7 100644 --- a/share/man/man4/oosiop.4 +++ b/share/man/man4/oosiop.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: oosiop.4,v 1.5 2008/05/14 13:29:27 tsutsui Exp $ +.\" $NetBSD: oosiop.4,v 1.6 2014/02/24 07:23:40 skrll Exp $ .\" .\" Copyright (c) 2003 Izumi Tsutsui. All rights reserved. .\" @@ -31,7 +31,7 @@ .Sh SYNOPSIS .Ss arc .Cd "oosiop* at jazzio?" -.Ss hp700 +.Ss hppa .Cd "oosiop0 at gsc?" .Pp .Cd "scsibus* at oosiop?" @@ -84,4 +84,4 @@ The .Nm driver was originally written by Shuichiro URATA for the arc port. Izumi Tsutsui modified the driver to make it really machine independent -for hp700. +for hppa. diff --git a/share/man/man4/osiop.4 b/share/man/man4/osiop.4 index c920e6ed6a5..bbd207cfb21 100644 --- a/share/man/man4/osiop.4 +++ b/share/man/man4/osiop.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: osiop.4,v 1.6 2008/05/14 13:29:27 tsutsui Exp $ +.\" $NetBSD: osiop.4,v 1.7 2014/02/24 07:23:40 skrll Exp $ .\" .\" Copyright (c) 2001 Izumi Tsutsui. All rights reserved. .\" @@ -33,7 +33,7 @@ .Cd "osiop* at jazzio? flags 0x00000" .Ss ews4800mips .Cd "osiop* at sbdio? flags 0x00000" -.Ss hp700 +.Ss hppa .Cd "osiop0 at gsc? flags 0x00000" .Ss mvme68k .Cd "osiop0 at pcctwo? ipl 2" diff --git a/share/man/man4/siop.4 b/share/man/man4/siop.4 index 49327bb5219..d4092a52200 100644 --- a/share/man/man4/siop.4 +++ b/share/man/man4/siop.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: siop.4,v 1.18 2011/04/28 16:11:37 wiz Exp $ +.\" $NetBSD: siop.4,v 1.19 2014/02/24 07:23:40 skrll Exp $ .\" .\" Copyright (c) 2000 Manuel Bouyer. .\" @@ -29,7 +29,7 @@ .Nm siop .Nd Symbios Logic/NCR 53c8xx SCSI driver .Sh SYNOPSIS -.Ss hp700 +.Ss hppa .Cd "siop* at mainbus? irq 3" .Cd "siop* at phatomas? irq 3" .Ss PCI diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index d88331f174a..c105c8afc15 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -1,4 +1,4 @@ -.\" $NetBSD: hier.7,v 1.107 2013/12/24 01:42:32 wiz Exp $ +.\" $NetBSD: hier.7,v 1.108 2014/02/24 07:23:40 skrll Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -774,8 +774,8 @@ SH3/SH4 based evaluation boards NEC's MIPS based EWS4800 workstations .It Sy hp300/ Hewlett-Packard 9000/300 and 400 680x0-based workstations -.It Sy hp700/ -Hewlett-Packard 9000/700 HPPA based workstations +.It Sy hppa/ +Hewlett-Packard 9000/700 and 9000/800 HPPA based workstations .It Sy hpcarm/ StrongARM based WinCE PDA machines .It Sy hpcmips/ diff --git a/share/man/man8/MAKEDEV.8 b/share/man/man8/MAKEDEV.8 index 36d8c7e962e..cea69091a40 100644 --- a/share/man/man8/MAKEDEV.8 +++ b/share/man/man8/MAKEDEV.8 @@ -6,7 +6,7 @@ .\" *** DO NOT EDIT - any changes will be lost!!! .\" *** ------------------------------------------------------------------ .\" -.\" $NetBSD: MAKEDEV.8,v 1.44 2012/02/25 10:55:28 shattered Exp $ +.\" $NetBSD: MAKEDEV.8,v 1.45 2014/02/24 07:23:41 skrll Exp $ .\" .\" Copyright (c) 2001, 2003, 2007, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -747,7 +747,7 @@ IIC bus device, see .Xr \&iic 4 . It Ar io X86 IOPL access for COMPAT_10, COMPAT_FREEBSD, see -.Xr \&hp700/io 4 , +.Xr \&hppa/io 4 , .Xr \&i386/io 4 . It Ar iop# I2O IOP control interface, see diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index 53d12aa1085..83e0be3b79d 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.103 2013/07/31 21:01:13 soren Exp $ +# $NetBSD: Makefile,v 1.104 2014/02/24 07:23:41 skrll Exp $ # from: @(#)Makefile 8.1 (Berkeley) 6/5/93 MAN= MAKEDEV.8 MAKEDEV.local.8 afterboot.8 boot.8 compat_30.8 \ @@ -21,9 +21,9 @@ MLINKS+=rc.8 rc.local.8 MLINKS+=rc.8 rc.shutdown.8 SUBDIR= man8.acorn26 man8.acorn32 man8.alpha man8.amiga man8.atari \ - man8.cobalt man8.dreamcast man8.emips man8.evbarm man8.hp300 \ - man8.hp700 man8.hpcarm \ - man8.hpcmips man8.hpcsh man8.mac68k man8.macppc \ + man8.cobalt man8.dreamcast man8.emips man8.evbarm \ + man8.hp300 man8.hpcarm man8.hpcmips man8.hpcsh man8.hppa \ + man8.mac68k man8.macppc \ man8.mvme68k man8.next68k man8.pmax man8.prep man8.sandpoint \ man8.sgimips man8.sparc man8.sparc64 man8.sun2 man8.sun3 \ man8.vax man8.x68k man8.x86 diff --git a/share/man/man8/man8.hp700/Makefile b/share/man/man8/man8.hp700/Makefile deleted file mode 100644 index 3ce8ada91eb..00000000000 --- a/share/man/man8/man8.hp700/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: Makefile,v 1.4 2012/01/09 16:04:46 skrll Exp $ - -MAN= boot.8 mkboot.8 -MANSUBDIR=/hp700 - -.include <bsd.man.mk> diff --git a/share/man/man8/man8.hppa/Makefile b/share/man/man8/man8.hppa/Makefile new file mode 100644 index 00000000000..b072bdf5e9a --- /dev/null +++ b/share/man/man8/man8.hppa/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:41 skrll Exp $ + +MAN= boot.8 mkboot.8 +MANSUBDIR=/hppa + +.include <bsd.man.mk> diff --git a/share/man/man8/man8.hp700/boot.8 b/share/man/man8/man8.hppa/boot.8 index 827be1950fe..73185359fd1 100644 --- a/share/man/man8/man8.hp700/boot.8 +++ b/share/man/man8/man8.hppa/boot.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: boot.8,v 1.3 2009/03/15 10:24:58 joerg Exp $ +.\" $NetBSD: boot.8,v 1.1 2014/02/24 07:23:41 skrll Exp $ .\" .\" $OpenBSD: boot_hppa.8,v 1.11 2004/05/25 22:27:44 jmc Exp $ .\" @@ -27,18 +27,18 @@ .\" SUCH DAMAGE. .\" .Dd July 27, 2004 -.Dt BOOT 8 hp700 +.Dt BOOT 8 hppa .Os .Sh NAME .Nm boot -.Nd hp700 system bootstrapping procedures +.Nd hppa system bootstrapping procedures .Sh DESCRIPTION .Ss System starts When powered on, after a panic, or if the system is rebooted via .Xr reboot 8 or .Xr shutdown 8 , -the hp700 firmware +the hppa firmware .Pq Dq PDC will proceed to its initialization, and will boot an operating system if autoboot is enabled. diff --git a/share/man/man8/man8.hp700/mkboot.8 b/share/man/man8/man8.hppa/mkboot.8 index 59e44bedb17..515825b2679 100644 --- a/share/man/man8/man8.hp700/mkboot.8 +++ b/share/man/man8/man8.hppa/mkboot.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: mkboot.8,v 1.2 2012/01/09 22:08:12 skrll Exp $ +.\" $NetBSD: mkboot.8,v 1.1 2014/02/24 07:23:41 skrll Exp $ .\" .\" $OpenBSD: mkboot.8,v 1.9 2007/05/31 19:20:03 jmc Exp $ .\" @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .Dd January 9, 2012 -.Dt MKBOOT 8 hp700 +.Dt MKBOOT 8 hppa .Os .Sh NAME .Nm mkboot diff --git a/share/mk/bsd.README b/share/mk/bsd.README index da6866ed2f8..6a408682130 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.327 2014/01/27 07:57:28 apb Exp $ +# $NetBSD: bsd.README,v 1.328 2014/02/24 07:23:41 skrll Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -792,7 +792,7 @@ TOOL_HEXDUMP Ascii, decimal, hexadecimal, octal dump. [hexdump] TOOL_HP300MKBOOT Make bootable image for hp300. [hp300-mkboot] -TOOL_HP700MKBOOT Make bootable image for hp700. [hp700-mkboot] +TOOL_HPPAMKBOOT Make bootable image for hppa. [hppa-mkboot] TOOL_INDXBIB Make bibliographic database's inverted index. [indxbib] diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 8c818dd5fb4..83c1a1f198d 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.766 2014/01/31 18:17:27 tsutsui Exp $ +# $NetBSD: bsd.own.mk,v 1.767 2014/02/24 07:23:41 skrll Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -295,7 +295,7 @@ TOOL_GREP= ${TOOLDIR}/bin/${_TOOL_PREFIX}grep TOOL_GROFF= PATH=${TOOLDIR}/lib/groff:$${PATH} ${TOOLDIR}/bin/${_TOOL_PREFIX}groff TOOL_HEXDUMP= ${TOOLDIR}/bin/${_TOOL_PREFIX}hexdump TOOL_HP300MKBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}hp300-mkboot -TOOL_HP700MKBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}hp700-mkboot +TOOL_HPPAMKBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}hppa-mkboot TOOL_INDXBIB= ${TOOLDIR}/bin/${_TOOL_PREFIX}indxbib TOOL_INSTALLBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}installboot TOOL_INSTALL_INFO= ${TOOLDIR}/bin/${_TOOL_PREFIX}install-info @@ -396,7 +396,7 @@ TOOL_GREP= grep TOOL_GROFF= groff TOOL_HEXDUMP= hexdump TOOL_HP300MKBOOT= hp300-mkboot -TOOL_HP700MKBOOT= hp700-mkboot +TOOL_HPPAMKBOOT= hppa-mkboot TOOL_INDXBIB= indxbib TOOL_INSTALLBOOT= installboot TOOL_INSTALL_INFO= install-info @@ -485,7 +485,7 @@ MACHINES.arm= acorn26 acorn32 cats epoc32 evbarm hpcarm \ MACHINES.coldfire= evbcf MACHINES.i386= i386 MACHINES.ia64= ia64 -MACHINES.hppa= hp700 +MACHINES.hppa= hppa MACHINES.m68000= sun2 MACHINES.m68k= amiga atari cesfic hp300 luna68k mac68k \ news68k next68k sun3 x68k diff --git a/sys/arch/README b/sys/arch/README index 284c9ed4b68..201354f8816 100644 --- a/sys/arch/README +++ b/sys/arch/README @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.60 2013/05/02 12:09:40 kiyohara Exp $ +$NetBSD: README,v 1.61 2014/02/24 07:23:41 skrll Exp $ acorn26 arm 20000509 Acorn ARM2- and ARM3-based machines acorn32 arm 20011118 Acorn computers Ltd. ARM 6/7/SA based machines @@ -22,7 +22,7 @@ evbppc powerpc,powerpc64 20021209 PowerPC-based eval boards evbsh3 sh3eb,sh3el 20010206 Hitachi SuperH(TM) sh3 and sh4 eval boards ews4800mips mipseb 20051229 NEC's MIPS based EWS4800 workstations hp300 m68k 19930512 Hewlett Packard 300- and 400-series machines -hp700 hppa 20020606 Hewlett Packard 700-series machines +hppa hppa 20020606 Hewlett Packard 700-series machines hpcarm arm 20010220 ARM based handheld PCs hpcmips mipsel 19990925 MIPS based handheld PCs hpcsh sh3el 20010117 Hitachi SuperH(TM) based handheld PCs diff --git a/sys/arch/hp700/Makefile b/sys/arch/hp700/Makefile deleted file mode 100644 index d42be27cf36..00000000000 --- a/sys/arch/hp700/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:32 lukem Exp $ - -SUBDIR= compile include stand - -.include <bsd.subdir.mk> diff --git a/sys/arch/hp700/compile/Makefile b/sys/arch/hp700/compile/Makefile deleted file mode 100644 index de20b72965b..00000000000 --- a/sys/arch/hp700/compile/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# $NetBSD: Makefile,v 1.1 2003/01/06 17:40:32 lukem Exp $ - -.include <bsd.prog.mk> diff --git a/sys/arch/hp700/conf/GENERIC.MP b/sys/arch/hp700/conf/GENERIC.MP deleted file mode 100644 index 1ba503bf69f..00000000000 --- a/sys/arch/hp700/conf/GENERIC.MP +++ /dev/null @@ -1,7 +0,0 @@ -# $NetBSD: GENERIC.MP,v 1.1 2012/05/23 08:19:40 skrll Exp $ -# -# Generic hp700 kernel with multiprocessor support. - -include "arch/hp700/conf/GENERIC" - -options MULTIPROCESSOR # include multiprocessor support diff --git a/sys/arch/hp700/conf/files.hp700 b/sys/arch/hp700/conf/files.hp700 deleted file mode 100644 index 6b91a172157..00000000000 --- a/sys/arch/hp700/conf/files.hp700 +++ /dev/null @@ -1,280 +0,0 @@ -# $NetBSD: files.hp700,v 1.25 2011/02/15 10:32:56 tsutsui Exp $ -# -# $OpenBSD: files.hp700,v 1.31 2001/06/26 02:41:25 mickey Exp $ -# -# hppa-specific configuration info - -# maxpartitions must be the first item in files.${ARCH} -maxpartitions 16 - -maxusers 2 8 64 - -# Status LEDs -defflag USELEDS - -include "dev/pckbport/files.pckbport" - -# -# Machine-independent SCSI drivers -# -include "dev/scsipi/files.scsipi" - -# -# Machine-independent ATA drivers -# -include "dev/ata/files.ata" - -# -# Machine-independent I2O drivers -# -include "dev/i2o/files.i2o" - -# -# Machine-independent USB drivers -# -include "dev/usb/files.usb" - -# -# Machine-independent IEEE1394 drivers -# -include "dev/ieee1394/files.ieee1394" -# -# PCI Bus support -# -include "dev/pci/files.pci" - -# -# ISA Bus support -# -include "dev/isa/files.isa" - -# -# EISA Bus support -# -include "dev/eisa/files.eisa" - -# -# HIL Human Interface Loop devices -# -include "dev/hil/files.hil" - - -# -# Gonzo System Connect Bus -# (GSC, GSC-1X, GSC+, GSC-1.5X, GSC-2X) -# -define gscbus { } - -# -# Mainbus -# - -define gedoens {[irq = -1]}: sysmon_power, sysmon_taskq -device mainbus: gedoens -attach mainbus at root -file arch/hp700/hp700/mainbus.c mainbus - -device pdc -attach pdc at gedoens -file arch/hp700/dev/pdc.c pdc - -device power -attach power at gedoens -file arch/hp700/dev/power.c power needs-flag - -device lcd -attach lcd at gedoens -file arch/hp700/dev/lcd.c lcd needs-flag - -device mem -attach mem at gedoens -file arch/hp700/dev/mem.c mem - -device cpu -attach cpu at gedoens -file arch/hp700/dev/cpu.c cpu - -device fpu -attach fpu at gedoens -file arch/hp700/dev/fpu.c fpu - -# Phantom PseudoBC GSC+ Port -device phantomas: gedoens -attach phantomas at gedoens -file arch/hp700/dev/phantomas.c phantomas - -# GeckoBOA BC GSC+ port -device gecko: gedoens -attach gecko at gedoens -file arch/hp700/dev/gecko.c gecko - -# U2/Uturn, Runway to GSC Bus bridge & IOA -device uturn: gedoens -attach uturn at gedoens -file arch/hp700/dev/uturn.c uturn - -# Astro memory & I/O controller -device astro: gedoens -attach astro at gedoens -file arch/hp700/dev/astro.c astro - -# 1FT1-0002, 1FU2-0002 -# as goes w/ 7100LC, 7300LC, 7200, 8000, 8200, 8500 -device lasi: gscbus -attach lasi at gedoens -file arch/hp700/dev/lasi.c lasi - -# all the older systems -device asp: gscbus -attach asp at gedoens -file arch/hp700/dev/asp.c asp - -# 1FT4-0001, ASIC used on gecko cards -device wax: gscbus -attach wax at gedoens -file arch/hp700/dev/wax.c wax - -device mongoose: isabus, eisabus -attach mongoose at gedoens -file arch/hp700/dev/mongoose.c mongoose - -# Dino, GSC-PCI bridge. Includes ps/2, serial, and flying toaster interfaces -# Cujo is a 64-bit data path Dino -device dino { }: pcibus -attach dino at gedoens -file arch/hp700/dev/dino.c dino - -attach com at dino with com_dino -file arch/hp700/dev/com_dino.c com_dino - -# Elroy, Ropes to PCI Bridge. Supports 4X PCI and dual address cycle. -# Mercury; QuickSilver is an AGP also -device elroy: pcibus -attach elroy at gedoens -file arch/hp700/dev/elroy.c elroy -file arch/hp700/dev/apic.c elroy - -attach sti at gedoens with sti_gedoens -file arch/hp700/dev/sti_sgc.c sti_gedoens -file arch/hp700/dev/sti_pci_machdep.c sti_pci - -attach siop at gedoens with siop_gedoens -file arch/hp700/dev/siop_sgc.c siop_gedoens - -device ssio {[irq = -1]} -attach ssio at pci -file arch/hp700/dev/ssio.c ssio - -attach com at ssio with com_ssio -file arch/hp700/dev/com_ssio.c com_ssio - -attach lpt at ssio with lpt_ssio -file arch/hp700/dev/lpt_ssio.c lpt_ssio - -### - -# -# GSC bus devices -# - -device gsc {[irq = -1]} -attach gsc at gscbus -file arch/hp700/gsc/gscbus.c gsc - -# com and lpt are both on WD 16C552 -attach com at gsc with com_gsc -file arch/hp700/gsc/com_gsc.c com - -attach lpt at gsc with lpt_gsc -file arch/hp700/gsc/lpt_gsc.c lpt - -# Floppy disk controller -#device fdc {drive = -1}: isadma -#file dev/isa/fd.c fdc needs-flag - -#attach fdc at isa with fdc_isa -#file dev/isa/fdc_isa.c fdc_isa - -#attach fdc at gsc with fdc_gsc -#file arch/hp700/gsc/fdc_gsc.c fdc_gsc - -#device fd: disk -#attach fd at fdc - -device ie: ifnet, ether, arp, i82586 -attach ie at gsc with ie_gsc -file arch/hp700/gsc/if_ie_gsc.c ie_gsc - -device iee: ifnet, ether, arp, i82596 -attach iee at gsc with iee_gsc -file arch/hp700/gsc/if_iee_gsc.c iee_gsc - -attach siop at gsc with siop_gsc -file arch/hp700/gsc/siop_gsc.c siop_gsc - -attach osiop at gsc with osiop_gsc -file arch/hp700/gsc/osiop_gsc.c osiop_gsc - -attach oosiop at gsc with oosiop_gsc -file arch/hp700/gsc/oosiop_gsc.c oosiop_gsc - -attach hil at gsc with hil_gsc -file arch/hp700/gsc/hil_gsc.c hil_gsc - -device gsckbc: pckbport -attach gsckbc at gsc -file arch/hp700/gsc/gsckbc.c gsckbc - -# PSB 2160-N based 8bit mono audio (705, 710, 745i/*, 747i/*) -device aone: audiobus, mulaw, auconv -attach aone at gsc -file arch/hp700/gsc/aone.c aone - -# CS4215/AD1849 based 16bit mono/stereo audio iface (most of others not w/ aone) -# a.k.a. Audio Type 2 (optional beeper) -device harmony {} : audiobus, mulaw, auconv -attach harmony at gsc -file arch/hp700/gsc/harmony.c harmony - -# fax/modem/voice on harmony -attach com at harmony with com_harmony -file arch/hp700/gsc/com_harmony.c com_harmony - -# HPA4011A/B w/ TMS380C26PQL, TMS38054FNL -#device tms: tokenring -#attach tms at gsc -#file arch/hp700/gsc/if_tms.c tms - -# these we don't know yet -# AMD Supernet2 FDDI ? -#device medusa: fddi -#attach medusa at gsc -#file arch/hp700/gsc/medusa.c medusa - -# XXX should not be here -# ANSI/VITA 26-1998 Gbit packet switching network iface -#device myri: ether -#attach myri at pci -#file dev/pci/myri.c myri - - -# Memory Disk -file dev/md_root.c memory_disk_hooks - - -# -# Non-device files -# - -file arch/hp700/hp700/autoconf.c -file arch/hp700/hp700/conf.c -file arch/hp700/hp700/disksubr.c disk -file arch/hp700/hp700/intr.c -file arch/hp700/hp700/machdep.c -file arch/hp700/hp700/sys_machdep.c -file arch/hp700/dev/clock.c - -file dev/cons.c -file dev/cninit.c - -include "arch/hp700/conf/majors.hp700" diff --git a/sys/arch/hp700/hp700/machdep.h b/sys/arch/hp700/hp700/machdep.h deleted file mode 100644 index a564cf6ee16..00000000000 --- a/sys/arch/hp700/hp700/machdep.h +++ /dev/null @@ -1,117 +0,0 @@ -/* $NetBSD: machdep.h,v 1.9 2012/02/23 21:38:53 skrll Exp $ */ - -/* $OpenBSD: cpufunc.h,v 1.17 2000/05/15 17:22:40 mickey Exp $ */ - -/* - * Copyright (c) 1998-2004 Michael Shalayeff - * 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. - * - * 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 OR HIS RELATIVES 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 MIND, 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. - */ -/* - * (c) Copyright 1988 HEWLETT-PACKARD COMPANY - * - * To anyone who acknowledges that this file is provided "AS IS" - * without any express or implied warranty: - * permission to use, copy, modify, and distribute this file - * for any purpose is hereby granted without fee, provided that - * the above copyright notice and this notice appears in all - * copies, and that the name of Hewlett-Packard Company not be - * used in advertising or publicity pertaining to distribution - * of the software without specific, written prior permission. - * Hewlett-Packard Company makes no representations about the - * suitability of this software for any purpose. - */ -/* - * Copyright (c) 1990,1994 The University of Utah and - * the Computer Systems Laboratory (CSL). All rights reserved. - * - * THE UNIVERSITY OF UTAH AND CSL PROVIDE THIS SOFTWARE IN ITS "AS IS" - * CONDITION, AND DISCLAIM ANY LIABILITY OF ANY KIND FOR ANY DAMAGES - * WHATSOEVER RESULTING FROM ITS USE. - * - * CSL requests users of this software to return to csl-dist@cs.utah.edu any - * improvements that they make and grant CSL redistribution rights. - * - * Utah $Hdr: c_support.s 1.8 94/12/14$ - * Author: Bob Wheeler, University of Utah CSL - */ - -/* - * Definitions for the hp700 that are completely private - * to the machine-dependent code. Anything needed by - * machine-independent code is covered in cpu.h or in - * other headers. - */ - -/* - * XXX there is a lot of stuff in various headers under - * hp700/include and hppa/include, and a lot of one-off - * `extern's in C files that could probably be moved here. - */ - -#ifdef _KERNEL - -#ifdef _KERNEL_OPT -#include "opt_useleds.h" -#endif - -#include <hppa/hppa/machdep.h> - -/* The LEDs. */ -#define HP700_LED_NETSND (0) -#define HP700_LED_NETRCV (1) -#define HP700_LED_DISK (2) -#define HP700_LED_HEARTBEAT (3) -#define _HP700_LEDS_BLINKABLE (4) -#define _HP700_LEDS_COUNT (8) - -/* This forcefully reboots the machine. */ -void cpu_die(void); - -/* These map and unmap page zero. */ -int hp700_pagezero_map(void); -void hp700_pagezero_unmap(int); - -/* Blinking the LEDs. */ -#ifdef USELEDS -#define _HP700_LED_FREQ (16) -extern volatile uint8_t *machine_ledaddr; -extern int machine_ledword, machine_leds; -extern int _hp700_led_on_cycles[]; -#define hp700_led_blink(i) \ -do { \ - if (_hp700_led_on_cycles[i] == -1) \ - _hp700_led_on_cycles[i] = 1; \ -} while (/* CONSTCOND */ 0) -#define hp700_led_on(i, ms) \ -do { \ - _hp700_led_on_cycles[i] = (((ms) * _HP700_LED_FREQ) / 1000); \ -} while (/* CONSTCOND */ 0) -void hp700_led_ctl(int, int, int); -#else /* !USELEDS */ -#define hp700_led_blink(i) -#define hp700_led_on(i, ms) -#define hp700_led_ctl(off, on, toggle) -#endif /* !USELEDS */ - -#endif /* _KERNEL */ diff --git a/sys/arch/hp700/include/Makefile b/sys/arch/hp700/include/Makefile deleted file mode 100644 index 29b33834eef..00000000000 --- a/sys/arch/hp700/include/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: Makefile,v 1.13 2012/05/27 11:26:38 skrll Exp $ - -INCSDIR= /usr/include/hp700 - -INCS= ansi.h aout_machdep.h asm.h autoconf.h \ - bswap.h byte_swap.h \ - cdefs.h cpu.h cpufunc.h \ - disklabel.h \ - eisa_machdep.h elf_machdep.h endian.h endian_machdep.h exec.h \ - float.h frame.h \ - ieee.h ieeefp.h intr.h intrdefs.h iomod.h isa_machdep.h \ - int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \ - kcore.h \ - limits.h loadfile_machdep.h lock.h \ - math.h mcontext.h mutex.h \ - nvm.h \ - param.h pcb.h pdc.h pmap.h pmc.h \ - proc.h profile.h psl.h pte.h ptrace.h \ - reg.h reloc.h rwlock.h \ - setjmp.h signal.h som.h \ - trap.h types.h \ - vmparam.h \ - wchar_limits.h - -.include <bsd.kinc.mk> diff --git a/sys/arch/hp700/include/ansi.h b/sys/arch/hp700/include/ansi.h deleted file mode 100644 index e75413ac1c0..00000000000 --- a/sys/arch/hp700/include/ansi.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: ansi.h,v 1.1 2002/06/06 19:48:07 fredette Exp $ */ - -#include <hppa/ansi.h> diff --git a/sys/arch/hp700/include/aout_machdep.h b/sys/arch/hp700/include/aout_machdep.h deleted file mode 100644 index 3801fecc168..00000000000 --- a/sys/arch/hp700/include/aout_machdep.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: aout_machdep.h,v 1.1 2002/06/06 19:48:07 fredette Exp $ */ - -#include <hppa/aout_machdep.h> diff --git a/sys/arch/hp700/include/asm.h b/sys/arch/hp700/include/asm.h deleted file mode 100644 index ac92caf0720..00000000000 --- a/sys/arch/hp700/include/asm.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: asm.h,v 1.1 2002/06/06 19:48:07 fredette Exp $ */ - -#include <hppa/asm.h> diff --git a/sys/arch/hp700/include/bswap.h b/sys/arch/hp700/include/bswap.h deleted file mode 100644 index f1358448729..00000000000 --- a/sys/arch/hp700/include/bswap.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: bswap.h,v 1.1 2002/06/06 19:48:07 fredette Exp $ */ - -#include <hppa/bswap.h> diff --git a/sys/arch/hp700/include/byte_swap.h b/sys/arch/hp700/include/byte_swap.h deleted file mode 100644 index ddce734e739..00000000000 --- a/sys/arch/hp700/include/byte_swap.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: byte_swap.h,v 1.1 2002/06/06 19:48:07 fredette Exp $ */ - -#include <hppa/byte_swap.h> diff --git a/sys/arch/hp700/include/cdefs.h b/sys/arch/hp700/include/cdefs.h deleted file mode 100644 index 6e57b785870..00000000000 --- a/sys/arch/hp700/include/cdefs.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: cdefs.h,v 1.1 2002/06/06 19:48:07 fredette Exp $ */ - -#include <hppa/cdefs.h> diff --git a/sys/arch/hp700/include/cpufunc.h b/sys/arch/hp700/include/cpufunc.h deleted file mode 100644 index 2891fe667b3..00000000000 --- a/sys/arch/hp700/include/cpufunc.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: cpufunc.h,v 1.1 2002/06/06 19:48:07 fredette Exp $ */ - -#include <hppa/cpufunc.h> diff --git a/sys/arch/hp700/include/db_machdep.h b/sys/arch/hp700/include/db_machdep.h deleted file mode 100644 index 60791b8a44a..00000000000 --- a/sys/arch/hp700/include/db_machdep.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: db_machdep.h,v 1.1 2002/06/06 19:48:07 fredette Exp $ */ - -#include <hppa/db_machdep.h> diff --git a/sys/arch/hp700/include/elf_machdep.h b/sys/arch/hp700/include/elf_machdep.h deleted file mode 100644 index 8cb934b904b..00000000000 --- a/sys/arch/hp700/include/elf_machdep.h +++ /dev/null @@ -1,7 +0,0 @@ -/* $NetBSD: elf_machdep.h,v 1.2 2010/05/17 09:13:03 ahoka Exp $ */ - -#if HAVE_NBTOOL_CONFIG_H -#include <nbinclude/hppa/elf_machdep.h> -#else -#include <hppa/elf_machdep.h> -#endif diff --git a/sys/arch/hp700/include/endian.h b/sys/arch/hp700/include/endian.h deleted file mode 100644 index a0fc6ce7bcd..00000000000 --- a/sys/arch/hp700/include/endian.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: endian.h,v 1.1 2002/06/06 19:48:07 fredette Exp $ */ - -#include <sys/endian.h> diff --git a/sys/arch/hp700/include/endian_machdep.h b/sys/arch/hp700/include/endian_machdep.h deleted file mode 100644 index 33550d5a6cf..00000000000 --- a/sys/arch/hp700/include/endian_machdep.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: endian_machdep.h,v 1.1 2002/06/06 19:48:07 fredette Exp $ */ - -#include <hppa/endian_machdep.h> diff --git a/sys/arch/hp700/include/exec.h b/sys/arch/hp700/include/exec.h deleted file mode 100644 index 7aadeee0a05..00000000000 --- a/sys/arch/hp700/include/exec.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: exec.h,v 1.1 2002/06/06 19:48:08 fredette Exp $ */ - -#include <hppa/exec.h> diff --git a/sys/arch/hp700/include/float.h b/sys/arch/hp700/include/float.h deleted file mode 100644 index bb0a7b751f5..00000000000 --- a/sys/arch/hp700/include/float.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: float.h,v 1.1 2002/06/06 19:48:08 fredette Exp $ */ - -#include <hppa/float.h> diff --git a/sys/arch/hp700/include/frame.h b/sys/arch/hp700/include/frame.h deleted file mode 100644 index 2b2fa5cab88..00000000000 --- a/sys/arch/hp700/include/frame.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: frame.h,v 1.1 2002/06/06 19:48:08 fredette Exp $ */ - -#include <hppa/frame.h> diff --git a/sys/arch/hp700/include/ieee.h b/sys/arch/hp700/include/ieee.h deleted file mode 100644 index 1a7f003b02e..00000000000 --- a/sys/arch/hp700/include/ieee.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: ieee.h,v 1.1 2002/06/06 19:48:08 fredette Exp $ */ - -#include <hppa/ieee.h> diff --git a/sys/arch/hp700/include/ieeefp.h b/sys/arch/hp700/include/ieeefp.h deleted file mode 100644 index e0565b81794..00000000000 --- a/sys/arch/hp700/include/ieeefp.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: ieeefp.h,v 1.1 2002/06/06 19:48:08 fredette Exp $ */ - -#include <hppa/ieeefp.h> diff --git a/sys/arch/hp700/include/int_const.h b/sys/arch/hp700/include/int_const.h deleted file mode 100644 index 0bed349c23e..00000000000 --- a/sys/arch/hp700/include/int_const.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: int_const.h,v 1.1 2002/06/06 19:48:08 fredette Exp $ */ - -#include <hppa/int_const.h> diff --git a/sys/arch/hp700/include/int_fmtio.h b/sys/arch/hp700/include/int_fmtio.h deleted file mode 100644 index 7e892b08804..00000000000 --- a/sys/arch/hp700/include/int_fmtio.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: int_fmtio.h,v 1.1 2002/06/06 19:48:08 fredette Exp $ */ - -#include <hppa/int_fmtio.h> diff --git a/sys/arch/hp700/include/int_limits.h b/sys/arch/hp700/include/int_limits.h deleted file mode 100644 index 2a7c89661e5..00000000000 --- a/sys/arch/hp700/include/int_limits.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: int_limits.h,v 1.1 2002/06/06 19:48:08 fredette Exp $ */ - -#include <hppa/int_limits.h> diff --git a/sys/arch/hp700/include/int_mwgwtypes.h b/sys/arch/hp700/include/int_mwgwtypes.h deleted file mode 100644 index 6edfd4f9fb8..00000000000 --- a/sys/arch/hp700/include/int_mwgwtypes.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: int_mwgwtypes.h,v 1.1 2002/06/06 19:48:08 fredette Exp $ */ - -#include <hppa/int_mwgwtypes.h> diff --git a/sys/arch/hp700/include/int_types.h b/sys/arch/hp700/include/int_types.h deleted file mode 100644 index abf3f36749c..00000000000 --- a/sys/arch/hp700/include/int_types.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: int_types.h,v 1.1 2002/06/06 19:48:08 fredette Exp $ */ - -#include <hppa/int_types.h> diff --git a/sys/arch/hp700/include/kcore.h b/sys/arch/hp700/include/kcore.h deleted file mode 100644 index fc2366b3f77..00000000000 --- a/sys/arch/hp700/include/kcore.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: kcore.h,v 1.1 2002/06/06 19:48:09 fredette Exp $ */ - -#include <hppa/kcore.h> diff --git a/sys/arch/hp700/include/limits.h b/sys/arch/hp700/include/limits.h deleted file mode 100644 index fef046e4cde..00000000000 --- a/sys/arch/hp700/include/limits.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: limits.h,v 1.1 2002/06/06 19:48:09 fredette Exp $ */ - -#include <hppa/limits.h> diff --git a/sys/arch/hp700/include/lock.h b/sys/arch/hp700/include/lock.h deleted file mode 100644 index 7cb4e222dae..00000000000 --- a/sys/arch/hp700/include/lock.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: lock.h,v 1.1 2002/06/06 19:48:09 fredette Exp $ */ - -#include <hppa/lock.h> diff --git a/sys/arch/hp700/include/math.h b/sys/arch/hp700/include/math.h deleted file mode 100644 index c4d90b4f593..00000000000 --- a/sys/arch/hp700/include/math.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: math.h,v 1.1 2002/06/06 19:48:09 fredette Exp $ */ - -#include <hppa/math.h> diff --git a/sys/arch/hp700/include/mcontext.h b/sys/arch/hp700/include/mcontext.h deleted file mode 100644 index 87381d66a0c..00000000000 --- a/sys/arch/hp700/include/mcontext.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: mcontext.h,v 1.2 2005/12/11 12:17:24 christos Exp $ */ - -#include <hppa/mcontext.h> diff --git a/sys/arch/hp700/include/mutex.h b/sys/arch/hp700/include/mutex.h deleted file mode 100644 index c0b58717dd4..00000000000 --- a/sys/arch/hp700/include/mutex.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: mutex.h,v 1.2 2007/02/09 21:55:03 ad Exp $ */ - -#include <hppa/mutex.h> diff --git a/sys/arch/hp700/include/param.h b/sys/arch/hp700/include/param.h deleted file mode 100644 index b701e1a03b1..00000000000 --- a/sys/arch/hp700/include/param.h +++ /dev/null @@ -1,39 +0,0 @@ -/* $NetBSD: param.h,v 1.4 2010/01/16 13:49:11 skrll Exp $ */ - -/* $OpenBSD: param.h,v 1.12 2001/07/06 02:07:41 provos Exp $ */ - -/* - * Copyright (c) 1988-1994, The University of Utah and - * the Computer Systems Laboratory at the University of Utah (CSL). - * All rights reserved. - * - * Permission to use, copy, modify and distribute this software is hereby - * granted provided that (1) source code retains these copyright, permission, - * and disclaimer notices, and (2) redistributions including binaries - * reproduce the notices in supporting documentation, and (3) all advertising - * materials mentioning features or use of this software display the following - * acknowledgement: ``This product includes software developed by the - * Computer Systems Laboratory at the University of Utah.'' - * - * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS - * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF - * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * CSL requests users of this software to return to csl-dist@cs.utah.edu any - * improvements that they make and grant CSL redistribution rights. - * - * Utah $Hdr: param.h 1.18 94/12/16$ - */ - -#ifdef _KERNEL -#include <machine/cpu.h> -#endif - -/* - * Machine dependent constants for PA-RISC. - */ - -#define _MACHINE hp700 -#define MACHINE "hp700" - -#include <hppa/param.h> diff --git a/sys/arch/hp700/include/pcb.h b/sys/arch/hp700/include/pcb.h deleted file mode 100644 index 56924070d92..00000000000 --- a/sys/arch/hp700/include/pcb.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: pcb.h,v 1.1 2002/06/06 19:48:09 fredette Exp $ */ - -#include <hppa/pcb.h> diff --git a/sys/arch/hp700/include/pmap.h b/sys/arch/hp700/include/pmap.h deleted file mode 100644 index 4b1e808cfdb..00000000000 --- a/sys/arch/hp700/include/pmap.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: pmap.h,v 1.1 2002/06/06 19:48:09 fredette Exp $ */ - -#include <hppa/pmap.h> diff --git a/sys/arch/hp700/include/pmc.h b/sys/arch/hp700/include/pmc.h deleted file mode 100644 index 5eb91a3e3a3..00000000000 --- a/sys/arch/hp700/include/pmc.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: pmc.h,v 1.1 2002/08/07 05:15:20 briggs Exp $ */ - -#include <hppa/pmc.h> diff --git a/sys/arch/hp700/include/proc.h b/sys/arch/hp700/include/proc.h deleted file mode 100644 index 92f04206c1b..00000000000 --- a/sys/arch/hp700/include/proc.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: proc.h,v 1.1 2002/06/06 19:48:10 fredette Exp $ */ - -#include <hppa/proc.h> diff --git a/sys/arch/hp700/include/profile.h b/sys/arch/hp700/include/profile.h deleted file mode 100644 index 65705b6acc1..00000000000 --- a/sys/arch/hp700/include/profile.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: profile.h,v 1.1 2002/06/06 19:48:10 fredette Exp $ */ - -#include <hppa/profile.h> diff --git a/sys/arch/hp700/include/psl.h b/sys/arch/hp700/include/psl.h deleted file mode 100644 index 3859dc8f014..00000000000 --- a/sys/arch/hp700/include/psl.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: psl.h,v 1.1 2002/06/06 19:48:10 fredette Exp $ */ - -#include <hppa/psl.h> diff --git a/sys/arch/hp700/include/pte.h b/sys/arch/hp700/include/pte.h deleted file mode 100644 index 803fc0a77c4..00000000000 --- a/sys/arch/hp700/include/pte.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: pte.h,v 1.1 2002/06/06 19:48:10 fredette Exp $ */ - -#include <hppa/pte.h> diff --git a/sys/arch/hp700/include/ptrace.h b/sys/arch/hp700/include/ptrace.h deleted file mode 100644 index 23ec02c8fa1..00000000000 --- a/sys/arch/hp700/include/ptrace.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: ptrace.h,v 1.1 2002/06/06 19:48:10 fredette Exp $ */ - -#include <hppa/ptrace.h> diff --git a/sys/arch/hp700/include/reg.h b/sys/arch/hp700/include/reg.h deleted file mode 100644 index abff5a2754a..00000000000 --- a/sys/arch/hp700/include/reg.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: reg.h,v 1.1 2002/06/06 19:48:10 fredette Exp $ */ - -#include <hppa/reg.h> diff --git a/sys/arch/hp700/include/reloc.h b/sys/arch/hp700/include/reloc.h deleted file mode 100644 index 79b36bb3318..00000000000 --- a/sys/arch/hp700/include/reloc.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: reloc.h,v 1.1 2002/06/06 19:48:10 fredette Exp $ */ - -#include <hppa/reloc.h> diff --git a/sys/arch/hp700/include/rwlock.h b/sys/arch/hp700/include/rwlock.h deleted file mode 100644 index 517216cd10c..00000000000 --- a/sys/arch/hp700/include/rwlock.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: rwlock.h,v 1.2 2007/02/09 21:55:03 ad Exp $ */ - -#include <hppa/rwlock.h> diff --git a/sys/arch/hp700/include/setjmp.h b/sys/arch/hp700/include/setjmp.h deleted file mode 100644 index e61ee8d15d4..00000000000 --- a/sys/arch/hp700/include/setjmp.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: setjmp.h,v 1.1 2002/06/06 19:48:10 fredette Exp $ */ - -#include <hppa/setjmp.h> diff --git a/sys/arch/hp700/include/signal.h b/sys/arch/hp700/include/signal.h deleted file mode 100644 index c3fef573cc9..00000000000 --- a/sys/arch/hp700/include/signal.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: signal.h,v 1.1 2002/06/06 19:48:10 fredette Exp $ */ - -#include <hppa/signal.h> diff --git a/sys/arch/hp700/include/som.h b/sys/arch/hp700/include/som.h deleted file mode 100644 index ebd002f1f6f..00000000000 --- a/sys/arch/hp700/include/som.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: som.h,v 1.1 2002/06/06 19:48:10 fredette Exp $ */ - -#include <hppa/som.h> diff --git a/sys/arch/hp700/include/trap.h b/sys/arch/hp700/include/trap.h deleted file mode 100644 index 29462a21ff3..00000000000 --- a/sys/arch/hp700/include/trap.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: trap.h,v 1.1 2002/06/06 19:48:10 fredette Exp $ */ - -#include <hppa/trap.h> diff --git a/sys/arch/hp700/include/types.h b/sys/arch/hp700/include/types.h deleted file mode 100644 index 6896bbed048..00000000000 --- a/sys/arch/hp700/include/types.h +++ /dev/null @@ -1,13 +0,0 @@ -/* $NetBSD: types.h,v 1.12 2011/07/17 23:32:21 dyoung Exp $ */ - -#ifndef _HP700_TYPES_H_ -#define _HP700_TYPES_H_ - -#include <hppa/types.h> - -#define __HAVE_NEW_STYLE_BUS_H - -#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS -#define __HAVE_MM_MD_KERNACC - -#endif /* _HP700_TYPES_H_ */ diff --git a/sys/arch/hp700/include/vmparam.h b/sys/arch/hp700/include/vmparam.h deleted file mode 100644 index 944cc9c22a6..00000000000 --- a/sys/arch/hp700/include/vmparam.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: vmparam.h,v 1.1 2002/06/06 19:48:10 fredette Exp $ */ - -#include <hppa/vmparam.h> diff --git a/sys/arch/hp700/include/wchar_limits.h b/sys/arch/hp700/include/wchar_limits.h deleted file mode 100644 index a1ee475aa8e..00000000000 --- a/sys/arch/hp700/include/wchar_limits.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $NetBSD: wchar_limits.h,v 1.2 2005/12/11 12:17:24 christos Exp $ */ - -#include <hppa/wchar_limits.h> diff --git a/sys/arch/hp700/stand/cdboot/version b/sys/arch/hp700/stand/cdboot/version deleted file mode 100644 index e45b63f75aa..00000000000 --- a/sys/arch/hp700/stand/cdboot/version +++ /dev/null @@ -1,3 +0,0 @@ -$NetBSD: version,v 1.1 2008/05/10 19:11:59 skrll Exp $ - -1.0: Initial version diff --git a/sys/arch/hppa/Makefile b/sys/arch/hppa/Makefile index bb74dcb3b21..b19d0ba4aec 100644 --- a/sys/arch/hppa/Makefile +++ b/sys/arch/hppa/Makefile @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.1 2002/06/05 01:04:18 fredette Exp $ +# $NetBSD: Makefile,v 1.2 2014/02/24 07:23:42 skrll Exp $ -SUBDIR= include +SUBDIR= compile include stand .include <bsd.subdir.mk> diff --git a/sys/arch/hppa/compile/Makefile b/sys/arch/hppa/compile/Makefile new file mode 100644 index 00000000000..cced955acd7 --- /dev/null +++ b/sys/arch/hppa/compile/Makefile @@ -0,0 +1,3 @@ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:42 skrll Exp $ + +.include <bsd.prog.mk> diff --git a/sys/arch/hp700/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index 5a8ac9a1f25..8f6f5764941 100644 --- a/sys/arch/hp700/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.124 2013/06/30 21:38:57 rmind Exp $ +# $NetBSD: GENERIC,v 1.1 2014/02/24 07:23:42 skrll Exp $ # # GENERIC machine description file # @@ -18,12 +18,12 @@ # of each device driver in this file see the section 4 man page for the # device. -include "arch/hp700/conf/std.hp700" +include "arch/hppa/conf/std.hppa" options INCLUDE_CONFIG_FILE # embed config file in kernel binary options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel -#ident "GENERIC-$Revision: 1.124 $" +#ident "GENERIC-$Revision: 1.1 $" maxusers 32 # estimated number of users @@ -758,7 +758,7 @@ pseudo-device accf_http # "httpready" accept filter # miscellaneous pseudo-devices pseudo-device pty # pseudo-terminals pseudo-device sequencer # MIDI sequencer -# rnd works; RND_COM does not on port hp700 yet. +# rnd works; RND_COM does not on port hppa yet. #options RND_COM # use "com" randomness as well (BROKEN) pseudo-device clockctl # user control of clock subsystem diff --git a/sys/arch/hppa/conf/GENERIC.MP b/sys/arch/hppa/conf/GENERIC.MP new file mode 100644 index 00000000000..20ad17b834c --- /dev/null +++ b/sys/arch/hppa/conf/GENERIC.MP @@ -0,0 +1,7 @@ +# $NetBSD: GENERIC.MP,v 1.1 2014/02/24 07:23:42 skrll Exp $ +# +# Generic hppa kernel with multiprocessor support. + +include "arch/hppa/conf/GENERIC" + +options MULTIPROCESSOR # include multiprocessor support diff --git a/sys/arch/hp700/conf/Makefile.hp700 b/sys/arch/hppa/conf/Makefile.hppa index 8e99b5f39a1..9c13683b1d2 100644 --- a/sys/arch/hp700/conf/Makefile.hp700 +++ b/sys/arch/hppa/conf/Makefile.hppa @@ -1,15 +1,15 @@ -# $NetBSD: Makefile.hp700,v 1.16 2009/12/27 14:54:24 skrll Exp $ +# $NetBSD: Makefile.hppa,v 1.1 2014/02/24 07:23:42 skrll 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/hp700/conf/``machineid'' +# /sys/arch/hppa/conf/``machineid'' # after which you should do # config machineid # Machine generic makefile changes should be made in -# /sys/arch/hp700/conf/Makefile.hp700 +# /sys/arch/hppa/conf/Makefile.hppa # after which config should be rerun for all machines of that type. # # To specify debugging, add the config line: makeoptions DEBUG="-g" @@ -24,14 +24,13 @@ NEED_OWN_INSTALL_TARGET?=no ## ## (1) port identification ## -HP700= $S/arch/hp700 HPPA= $S/arch/hppa -GENASSYM_CONF= ${HP700}/hp700/genassym.cf +GENASSYM_CONF= ${HPPA}/hppa/genassym.cf ## ## (2) compile settings ## -CPPFLAGS+= -Dhppa -Dhp700 +CPPFLAGS+= -Dhppa CFLAGS+= -mpa-risc-1-1 -msoft-float -mdisable-fpregs .include "${HPPA}/spmath/Makefile.inc" @@ -60,15 +59,15 @@ KERN_AS= obj ## MD_OBJS= locore.o ${LIBSPMATH} MD_CFILES= -MD_SFILES= ${HP700}/hp700/locore.S +MD_SFILES= ${HPPA}/hppa/locore.S -locore.o: ${HP700}/hp700/locore.S +locore.o: ${HPPA}/hppa/locore.S ${NORMAL_S} ## ## (5) link settings ## -LINKFORMAT= -T ${HP700}/conf/ld.script +LINKFORMAT= -T ${HPPA}/conf/ld.script TEXTADDR?= 00200000 LINKFLAGS_NORMAL= -X EXTRA_LINKFLAGS= -Map $@.map diff --git a/sys/arch/hp700/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK index ca05eb1b0ff..20099d6a5f5 100644 --- a/sys/arch/hp700/conf/RAMDISK +++ b/sys/arch/hppa/conf/RAMDISK @@ -1,9 +1,9 @@ -# $NetBSD: RAMDISK,v 1.6 2009/05/08 09:33:57 skrll Exp $ +# $NetBSD: RAMDISK,v 1.1 2014/02/24 07:23:42 skrll Exp $ # # RAMDISK machine description file # -include "arch/hp700/conf/GENERIC" +include "arch/hppa/conf/GENERIC" # Enable the hooks used for initializing the root memory-disk. options MEMORY_DISK_HOOKS diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa index b301d53cee3..401d03a19c6 100644 --- a/sys/arch/hppa/conf/files.hppa +++ b/sys/arch/hppa/conf/files.hppa @@ -1,41 +1,314 @@ -# $NetBSD: files.hppa,v 1.17 2012/04/05 19:53:35 skrll Exp $ +# $NetBSD: files.hppa,v 1.18 2014/02/24 07:23:42 skrll Exp $ # # $OpenBSD: files.hppa,v 1.31 2001/06/26 02:41:25 mickey Exp $ # # hppa-specific configuration info +# maxpartitions must be the first item in files.${ARCH} +maxpartitions 16 + +maxusers 2 8 64 + # Processor type options. defflag opt_cputype.h HP7000_CPU HP7100_CPU HP7150_CPU HP7100LC_CPU HP7200_CPU HP7250_CPU HP7300LC_CPU HP8000_CPU HP8200_CPU HP8500_CPU HP8600_CPU +# Status LEDs +defflag USELEDS + +# +# Compatibility +# +include "compat/ossaudio/files.ossaudio" + +include "compat/osf1/files.osf1" +file arch/hppa/hppa/osf1_machdep.c compat_osf1 + +include "compat/linux/files.linux" +file arch/hppa/hppa/linux_machdep.c compat_linux + + +include "dev/pckbport/files.pckbport" + +# +# Machine-independent SCSI drivers +# +include "dev/scsipi/files.scsipi" + +# +# Machine-independent ATA drivers +# +include "dev/ata/files.ata" + +# +# Machine-independent I2O drivers +# +include "dev/i2o/files.i2o" + +# +# Machine-independent USB drivers +# +include "dev/usb/files.usb" + +# +# Machine-independent IEEE1394 drivers +# +include "dev/ieee1394/files.ieee1394" + +# +# PCI Bus support +# +include "dev/pci/files.pci" + +# +# ISA Bus support +# +include "dev/isa/files.isa" + +# +# EISA Bus support +# +include "dev/eisa/files.eisa" + +# +# HIL Human Interface Loop devices +# +include "dev/hil/files.hil" + +# +# Gonzo System Connect Bus +# (GSC, GSC-1X, GSC+, GSC-1.5X, GSC-2X) +# +define gscbus { } + +# +# Mainbus +# + +define gedoens {[irq = -1]}: sysmon_power, sysmon_taskq +device mainbus: gedoens +attach mainbus at root +file arch/hppa/hppa/mainbus.c mainbus + +device pdc +attach pdc at gedoens +file arch/hppa/dev/pdc.c pdc + +device power +attach power at gedoens +file arch/hppa/dev/power.c power needs-flag + +device lcd +attach lcd at gedoens +file arch/hppa/dev/lcd.c lcd needs-flag + +device mem +attach mem at gedoens +file arch/hppa/dev/mem.c mem + +device cpu +attach cpu at gedoens +file arch/hppa/dev/cpu.c cpu + +device fpu +attach fpu at gedoens +file arch/hppa/dev/fpu.c fpu + +# Phantom PseudoBC GSC+ Port +device phantomas: gedoens +attach phantomas at gedoens +file arch/hppa/dev/phantomas.c phantomas + +# GeckoBOA BC GSC+ port +device gecko: gedoens +attach gecko at gedoens +file arch/hppa/dev/gecko.c gecko + +# U2/Uturn, Runway to GSC Bus bridge & IOA +device uturn: gedoens +attach uturn at gedoens +file arch/hppa/dev/uturn.c uturn + +# Astro memory & I/O controller +device astro: gedoens +attach astro at gedoens +file arch/hppa/dev/astro.c astro + +# 1FT1-0002, 1FU2-0002 +# as goes w/ 7100LC, 7300LC, 7200, 8000, 8200, 8500 +device lasi: gscbus +attach lasi at gedoens +file arch/hppa/dev/lasi.c lasi + +# all the older systems +device asp: gscbus +attach asp at gedoens +file arch/hppa/dev/asp.c asp + +# 1FT4-0001, ASIC used on gecko cards +device wax: gscbus +attach wax at gedoens +file arch/hppa/dev/wax.c wax + +device mongoose: isabus, eisabus +attach mongoose at gedoens +file arch/hppa/dev/mongoose.c mongoose + +# Dino, GSC-PCI bridge. Includes ps/2, serial, and flying toaster interfaces +# Cujo is a 64-bit data path Dino +device dino { }: pcibus +attach dino at gedoens +file arch/hppa/dev/dino.c dino + +attach com at dino with com_dino +file arch/hppa/dev/com_dino.c com_dino + +# Elroy, Ropes to PCI Bridge. Supports 4X PCI and dual address cycle. +# Mercury; QuickSilver is an AGP also +device elroy: pcibus +attach elroy at gedoens +file arch/hppa/dev/elroy.c elroy +file arch/hppa/dev/apic.c elroy + +attach sti at gedoens with sti_gedoens +file arch/hppa/dev/sti_sgc.c sti_gedoens +file arch/hppa/dev/sti_pci_machdep.c sti_pci + +attach siop at gedoens with siop_gedoens +file arch/hppa/dev/siop_sgc.c siop_gedoens + +device ssio {[irq = -1]} +attach ssio at pci +file arch/hppa/dev/ssio.c ssio + +attach com at ssio with com_ssio +file arch/hppa/dev/com_ssio.c com_ssio + +attach lpt at ssio with lpt_ssio +file arch/hppa/dev/lpt_ssio.c lpt_ssio + +### + +# +# GSC bus devices +# + +device gsc {[irq = -1]} +attach gsc at gscbus +file arch/hppa/gsc/gscbus.c gsc + +# com and lpt are both on WD 16C552 +attach com at gsc with com_gsc +file arch/hppa/gsc/com_gsc.c com + +attach lpt at gsc with lpt_gsc +file arch/hppa/gsc/lpt_gsc.c lpt + +# Floppy disk controller +#device fdc {drive = -1}: isadma +#file dev/isa/fd.c fdc needs-flag + +#attach fdc at isa with fdc_isa +#file dev/isa/fdc_isa.c fdc_isa + +#attach fdc at gsc with fdc_gsc +#file arch/hppa/gsc/fdc_gsc.c fdc_gsc + +#device fd: disk +#attach fd at fdc + +device ie: ifnet, ether, arp, i82586 +attach ie at gsc with ie_gsc +file arch/hppa/gsc/if_ie_gsc.c ie_gsc + +device iee: ifnet, ether, arp, i82596 +attach iee at gsc with iee_gsc +file arch/hppa/gsc/if_iee_gsc.c iee_gsc + +attach siop at gsc with siop_gsc +file arch/hppa/gsc/siop_gsc.c siop_gsc + +attach osiop at gsc with osiop_gsc +file arch/hppa/gsc/osiop_gsc.c osiop_gsc + +attach oosiop at gsc with oosiop_gsc +file arch/hppa/gsc/oosiop_gsc.c oosiop_gsc + +attach hil at gsc with hil_gsc +file arch/hppa/gsc/hil_gsc.c hil_gsc + +device gsckbc: pckbport +attach gsckbc at gsc +file arch/hppa/gsc/gsckbc.c gsckbc + +# PSB 2160-N based 8bit mono audio (705, 710, 745i/*, 747i/*) +device aone: audiobus, mulaw, auconv +attach aone at gsc +file arch/hppa/gsc/aone.c aone + +# CS4215/AD1849 based 16bit mono/stereo audio iface (most of others not w/ aone) +# a.k.a. Audio Type 2 (optional beeper) +device harmony {} : audiobus, mulaw, auconv +attach harmony at gsc +file arch/hppa/gsc/harmony.c harmony + +# fax/modem/voice on harmony +attach com at harmony with com_harmony +file arch/hppa/gsc/com_harmony.c com_harmony + +# HPA4011A/B w/ TMS380C26PQL, TMS38054FNL +#device tms: tokenring +#attach tms at gsc +#file arch/hppa/gsc/if_tms.c tms + +# these we don't know yet +# AMD Supernet2 FDDI ? +#device medusa: fddi +#attach medusa at gsc +#file arch/hppa/gsc/medusa.c medusa + +# XXX should not be here +# ANSI/VITA 26-1998 Gbit packet switching network iface +#device myri: ether +#attach myri at pci +#file dev/pci/myri.c myri + + +# Memory Disk +file dev/md_root.c memory_disk_hooks + +# +# Non-device files +# +file arch/hppa/hppa/autoconf.c +file arch/hppa/hppa/conf.c file arch/hppa/hppa/core_machdep.c coredump file arch/hppa/hppa/db_interface.c ddb file arch/hppa/hppa/db_disasm.c ddb file arch/hppa/hppa/db_memrw.c ddb | kgdb file arch/hppa/hppa/db_trace.c ddb file arch/hppa/hppa/db_machdep.c ddb +file arch/hppa/hppa/disksubr.c disk file arch/hppa/hppa/fpu.c file arch/hppa/hppa/ipifuncs.c multiprocessor file arch/hppa/hppa/kgdb_hppa.c kgdb file arch/hppa/hppa/kobj_machdep.c modular file arch/hppa/hppa/hppa_machdep.c file arch/hppa/hppa/idle_machdep.c +file arch/hppa/hppa/intr.c file arch/hppa/hppa/lock_stubs.S +file arch/hppa/hppa/machdep.c file arch/hppa/hppa/pmap.c file arch/hppa/hppa/process_machdep.c file arch/hppa/hppa/sig_machdep.c +file arch/hppa/hppa/sys_machdep.c file arch/hppa/hppa/trap.c file arch/hppa/hppa/vm_machdep.c file arch/hppa/hppa/procfs_machdep.c procfs +file arch/hppa/dev/clock.c -# -# Compatibility -# -include "compat/ossaudio/files.ossaudio" +file dev/cons.c +file dev/cninit.c -include "compat/osf1/files.osf1" -file arch/hp700/hp700/osf1_machdep.c compat_osf1 - -include "compat/linux/files.linux" -file arch/hp700/hp700/linux_machdep.c compat_linux +include "arch/hppa/conf/majors.hppa" diff --git a/sys/arch/hp700/conf/ld.script b/sys/arch/hppa/conf/ld.script index 05de0090706..e55b1d76abf 100644 --- a/sys/arch/hp700/conf/ld.script +++ b/sys/arch/hppa/conf/ld.script @@ -1,4 +1,4 @@ -/* $NetBSD: ld.script,v 1.11 2007/02/21 10:00:59 skrll Exp $ */ +/* $NetBSD: ld.script,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: ld.script,v 1.7 1999/12/17 07:02:38 mickey Exp $ */ diff --git a/sys/arch/hp700/conf/majors.hp700 b/sys/arch/hppa/conf/majors.hppa index 3a77dd0fa0f..86280358272 100644 --- a/sys/arch/hp700/conf/majors.hp700 +++ b/sys/arch/hppa/conf/majors.hppa @@ -1,6 +1,6 @@ -# $NetBSD: majors.hp700,v 1.27 2012/01/07 16:11:19 skrll Exp $ +# $NetBSD: majors.hppa,v 1.1 2014/02/24 07:23:42 skrll Exp $ # -# Device majors for hp700 +# Device majors for hppa # device-major cons char 0 diff --git a/sys/arch/hp700/conf/std.hp700 b/sys/arch/hppa/conf/std.hppa index 0f862d85fcd..299293a6693 100644 --- a/sys/arch/hp700/conf/std.hp700 +++ b/sys/arch/hppa/conf/std.hppa @@ -1,8 +1,8 @@ -# $NetBSD: std.hp700,v 1.3 2005/12/11 12:17:24 christos Exp $ +# $NetBSD: std.hppa,v 1.1 2014/02/24 07:23:42 skrll Exp $ # -# standard, required NetBSD/hp700 'options' +# standard, required NetBSD/hppa 'options' -machine hp700 hppa +machine hppa include "conf/std" # MI standard options options EXEC_ELF32 # exec ELF binaries diff --git a/sys/arch/hp700/dev/Makefile b/sys/arch/hppa/dev/Makefile index b8fdb151808..1539c9c514d 100644 --- a/sys/arch/hp700/dev/Makefile +++ b/sys/arch/hppa/dev/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/01/10 16:36:54 christos Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:42 skrll Exp $ # $OpenBSD: Makefile,v 1.3 1999/04/20 20:19:37 mickey Exp $ diff --git a/sys/arch/hp700/dev/apic.c b/sys/arch/hppa/dev/apic.c index f460dd48292..d32db0eaeda 100644 --- a/sys/arch/hp700/dev/apic.c +++ b/sys/arch/hppa/dev/apic.c @@ -1,4 +1,4 @@ -/* $NetBSD: apic.c,v 1.16 2012/05/23 16:11:37 skrll Exp $ */ +/* $NetBSD: apic.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: apic.c,v 1.14 2011/05/01 21:59:39 kettenis Exp $ */ @@ -32,8 +32,8 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> -#include <hp700/dev/elroyreg.h> -#include <hp700/dev/elroyvar.h> +#include <hppa/dev/elroyreg.h> +#include <hppa/dev/elroyvar.h> #define APIC_INT_LINE_MASK 0x0000ff00 #define APIC_INT_LINE_SHIFT 8 @@ -138,7 +138,7 @@ apic_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp) #endif line = PCI_INTERRUPT_LINE(reg); if (sc->sc_irq[line] == 0) - sc->sc_irq[line] = hp700_intr_allocate_bit(&ci->ci_ir, -1); + sc->sc_irq[line] = hppa_intr_allocate_bit(&ci->ci_ir, -1); KASSERT(sc->sc_irq[line] != -1); *ihp = (line << APIC_INT_LINE_SHIFT) | sc->sc_irq[line]; @@ -194,7 +194,7 @@ apic_intr_establish(void *v, pci_intr_handle_t ih, biv = apic_intr_list[irq]; if (biv == NULL) { - iv = hp700_intr_establish(pri, apic_intr, aiv, &ci->ci_ir, irq); + iv = hppa_intr_establish(pri, apic_intr, aiv, &ci->ci_ir, irq); if (iv == NULL) { free(aiv, M_DEVBUF); free(cnt, M_DEVBUF); diff --git a/sys/arch/hp700/dev/asp.c b/sys/arch/hppa/dev/asp.c index 6fff0712013..eae22d38681 100644 --- a/sys/arch/hp700/dev/asp.c +++ b/sys/arch/hppa/dev/asp.c @@ -1,4 +1,4 @@ -/* $NetBSD: asp.c,v 1.23 2013/10/19 13:49:11 skrll Exp $ */ +/* $NetBSD: asp.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $ */ @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.23 2013/10/19 13:49:11 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.1 2014/02/24 07:23:42 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -49,11 +49,11 @@ __KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.23 2013/10/19 13:49:11 skrll Exp $"); #include <machine/autoconf.h> #include <machine/cpufunc.h> -#include <hp700/hp700/machdep.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/dev/viper.h> +#include <hppa/hppa/machdep.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/dev/viper.h> -#include <hp700/gsc/gscbusvar.h> +#include <hppa/gsc/gscbusvar.h> struct asp_hwr { uint8_t asp_reset; @@ -125,7 +125,7 @@ const struct asp_spus_tag { struct asp_softc { device_t sc_dev; - struct hp700_interrupt_register sc_ir; + struct hppa_interrupt_register sc_ir; volatile struct asp_hwr *sc_hw; volatile struct asp_trs *sc_trs; @@ -151,7 +151,7 @@ asp_fix_args(void *_sc, struct gsc_attach_args *ga) * Determine this module's interrupt bit. */ module_offset = ga->ga_hpa - (hppa_hpa_t) sc->sc_trs; - ga->ga_irq = HP700CF_IRQ_UNDEF; + ga->ga_irq = HPPACF_IRQ_UNDEF; #define ASP_IRQ(off, irq) if (module_offset == off) ga->ga_irq = irq ASP_IRQ(0x22000, 6); /* com1 */ ASP_IRQ(0x23000, 5); /* com0 */ @@ -193,8 +193,8 @@ aspattach(device_t parent, device_t self, void *aux) sc->sc_dev = self; - ca->ca_irq = hp700_intr_allocate_bit(&ci->ci_ir, ca->ca_irq); - if (ca->ca_irq == HP700CF_IRQ_UNDEF) { + ca->ca_irq = hppa_intr_allocate_bit(&ci->ci_ir, ca->ca_irq); + if (ca->ca_irq == HPPACF_IRQ_UNDEF) { aprint_error_dev(self, ": can't allocate interrupt"); return; } @@ -248,7 +248,7 @@ aspattach(device_t parent, device_t self, void *aux) sc->sc_trs->asp_imr = 0; /* Establish the interrupt register. */ - hp700_interrupt_register_establish(ci, &sc->sc_ir); + hppa_interrupt_register_establish(ci, &sc->sc_ir); sc->sc_ir.ir_name = device_xname(self); sc->sc_ir.ir_mask = &sc->sc_trs->asp_imr; sc->sc_ir.ir_req = &sc->sc_trs->asp_irr; diff --git a/sys/arch/hp700/dev/astro.c b/sys/arch/hppa/dev/astro.c index 024193ff3ea..37eae728065 100644 --- a/sys/arch/hp700/dev/astro.c +++ b/sys/arch/hppa/dev/astro.c @@ -1,4 +1,4 @@ -/* $NetBSD: astro.c,v 1.14 2012/01/27 18:52:55 para Exp $ */ +/* $NetBSD: astro.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: astro.c,v 1.8 2007/10/06 23:50:54 krw Exp $ */ @@ -33,8 +33,8 @@ #include <machine/pdc.h> #include <machine/endian.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/hp700/machdep.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/hppa/machdep.h> struct astro_regs { uint32_t rid; @@ -314,10 +314,10 @@ astro_attach(device_t parent, device_t self, void *aux) * will stop working if we do. This is fine since the serial port * doesn't do DMA. */ - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); if (PAGE0->mem_cons.pz_class != PCL_DUPLEX) pdcproc_ioreset(); - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); /* Enable iova space. */ r->tlb_ibase = htole32(1); diff --git a/sys/arch/hp700/dev/clock.c b/sys/arch/hppa/dev/clock.c index 38adcae58bd..9dc6dca0ef1 100644 --- a/sys/arch/hp700/dev/clock.c +++ b/sys/arch/hppa/dev/clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.7 2009/11/03 05:07:25 snj Exp $ */ +/* $NetBSD: clock.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: clock.c,v 1.10 2001/08/31 03:13:42 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.7 2009/11/03 05:07:25 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.1 2014/02/24 07:23:42 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.7 2009/11/03 05:07:25 snj Exp $"); #include <machine/cpufunc.h> #include <machine/autoconf.h> -#include <hp700/hp700/machdep.h> +#include <hppa/hppa/machdep.h> #if defined(DDB) #include <machine/db_machdep.h> diff --git a/sys/arch/hp700/dev/com_dino.c b/sys/arch/hppa/dev/com_dino.c index 9037316f1bf..21df87321bf 100644 --- a/sys/arch/hp700/dev/com_dino.c +++ b/sys/arch/hppa/dev/com_dino.c @@ -39,8 +39,8 @@ #include <dev/ic/comreg.h> #include <dev/ic/comvar.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/hp700/machdep.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/hppa/machdep.h> void *dino_intr_establish(void *sc, int irq, int pri, int (*handler)(void *v), void *arg); @@ -101,7 +101,7 @@ com_dino_attach(device_t parent, device_t self, void *aux) sc->sc_frequency = COM_DINO_FREQ; /* Test if this is the console. Compare either HPA or device path. */ - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); if (PAGE0->mem_cons.pz_class == PCL_DUPLEX && PAGE0->mem_cons.pz_hpa == (struct iomod *)ca->ca_hpa) { @@ -115,11 +115,11 @@ com_dino_attach(device_t parent, device_t self, void *aux) sc->sc_frequency, COM_TYPE_NORMAL, (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8) != 0) { aprint_error(": can't comcnattach\n"); - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); return; } } - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); /* * Get the already initialized console ioh via com_is_console() if diff --git a/sys/arch/hp700/dev/com_ssio.c b/sys/arch/hppa/dev/com_ssio.c index ef006e25125..a763bb41521 100644 --- a/sys/arch/hp700/dev/com_ssio.c +++ b/sys/arch/hppa/dev/com_ssio.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_ssio.c,v 1.3 2011/07/01 18:33:09 dyoung Exp $ */ +/* $NetBSD: com_ssio.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: com_ssio.c,v 1.2 2007/06/24 16:28:39 kettenis Exp $ */ @@ -29,8 +29,8 @@ #include <dev/ic/comreg.h> #include <dev/ic/comvar.h> -#include <hp700/hp700/machdep.h> -#include <hp700/dev/ssiovar.h> +#include <hppa/hppa/machdep.h> +#include <hppa/dev/ssiovar.h> void *ssio_intr_establish(int, int, int (*)(void *), void *, const char *); @@ -86,7 +86,7 @@ com_ssio_attach(device_t parent, device_t self, void *aux) } /* Test if this is the console. */ - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); if (PAGE0->mem_cons.pz_class == PCL_DUPLEX && PAGE0->mem_cons.pz_hpa == (struct iomod *)ioh) { bus_space_unmap(iot, ioh, COM_NPORTS); @@ -94,11 +94,11 @@ com_ssio_attach(device_t parent, device_t self, void *aux) COM_TYPE_NORMAL, (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8) != 0) { aprint_error(": can't comcnattach\n"); - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); return; } } - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); sc->sc_frequency = COM_SSIO_FREQ; COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase); diff --git a/sys/arch/hp700/dev/cpu.c b/sys/arch/hppa/dev/cpu.c index 9249c56034d..7d85517515b 100644 --- a/sys/arch/hp700/dev/cpu.c +++ b/sys/arch/hppa/dev/cpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.30 2013/02/21 15:16:02 skrll Exp $ */ +/* $NetBSD: cpu.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: cpu.c,v 1.29 2009/02/08 18:33:28 miod Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.30 2013/02/21 15:16:02 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.1 2014/02/24 07:23:42 skrll Exp $"); #include "opt_multiprocessor.h" @@ -47,8 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.30 2013/02/21 15:16:02 skrll Exp $"); #include <machine/autoconf.h> #include <hppa/hppa/cpuvar.h> -#include <hp700/hp700/machdep.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/hppa/machdep.h> +#include <hppa/dev/cpudevs.h> #ifdef MULTIPROCESSOR @@ -89,7 +89,7 @@ cpuattach(device_t parent, device_t self, void *aux) struct cpu_softc *sc = device_private(self); struct confargs *ca = aux; static const char lvls[4][4] = { "0", "1", "1.5", "2" }; - struct hp700_interrupt_register *ir; + struct hppa_interrupt_register *ir; struct cpu_info *ci; u_int mhz = 100 * cpu_ticksnum / cpu_ticksdenom; int cpuno = device_unit(self); @@ -164,18 +164,18 @@ cpuattach(device_t parent, device_t self, void *aux) ci->ci_cpuid = cpuno; ci->ci_hpa = ca->ca_hpa; - hp700_intr_initialise(ci); + hppa_intr_initialise(ci); ir = &ci->ci_ir; - hp700_interrupt_register_establish(ci, ir); + hppa_interrupt_register_establish(ci, ir); ir->ir_iscpu = true; ir->ir_ci = ci; ir->ir_name = device_xname(self); - sc->sc_ihclk = hp700_intr_establish(IPL_CLOCK, clock_intr, + sc->sc_ihclk = hppa_intr_establish(IPL_CLOCK, clock_intr, NULL /*clockframe*/, &ci->ci_ir, 31); #ifdef MULTIPROCESSOR - sc->sc_ihipi = hp700_intr_establish(IPL_HIGH, hppa_ipi_intr, + sc->sc_ihipi = hppa_intr_establish(IPL_HIGH, hppa_ipi_intr, NULL /*clockframe*/, &ci->ci_ir, 30); #endif diff --git a/sys/arch/hp700/dev/cpudevs b/sys/arch/hppa/dev/cpudevs index 876eb2ff276..724e1a16dda 100644 --- a/sys/arch/hp700/dev/cpudevs +++ b/sys/arch/hppa/dev/cpudevs @@ -1,4 +1,4 @@ -$NetBSD: cpudevs,v 1.6 2012/02/26 07:50:37 skrll Exp $ +$NetBSD: cpudevs,v 1.1 2014/02/24 07:23:42 skrll Exp $ $OpenBSD: cpudevs,v 1.44 2007/05/18 15:57:35 kettenis Exp $ diff --git a/sys/arch/hp700/dev/cpudevs.h b/sys/arch/hppa/dev/cpudevs.h index f6850bfe02b..a291ef05133 100644 --- a/sys/arch/hp700/dev/cpudevs.h +++ b/sys/arch/hppa/dev/cpudevs.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpudevs.h,v 1.7 2012/02/26 07:51:56 skrll Exp $ */ +/* $NetBSD: cpudevs.h,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. diff --git a/sys/arch/hp700/dev/cpudevs_data.h b/sys/arch/hppa/dev/cpudevs_data.h index f67ee783a39..b8faf4dc94d 100644 --- a/sys/arch/hp700/dev/cpudevs_data.h +++ b/sys/arch/hppa/dev/cpudevs_data.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpudevs_data.h,v 1.8 2012/02/26 07:51:56 skrll Exp $ */ +/* $NetBSD: cpudevs_data.h,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. diff --git a/sys/arch/hp700/dev/devlist2h.awk b/sys/arch/hppa/dev/devlist2h.awk index d11a3800690..b0c6acc6851 100644 --- a/sys/arch/hp700/dev/devlist2h.awk +++ b/sys/arch/hppa/dev/devlist2h.awk @@ -1,4 +1,4 @@ -# $NetBSD: devlist2h.awk,v 1.6 2012/02/05 08:31:53 skrll Exp $ +# $NetBSD: devlist2h.awk,v 1.1 2014/02/24 07:23:42 skrll Exp $ # $OpenBSD: devlist2h.awk,v 1.6 2004/04/07 18:24:19 mickey Exp $ diff --git a/sys/arch/hp700/dev/dino.c b/sys/arch/hppa/dev/dino.c index c40fe2a5624..388d25b41b8 100644 --- a/sys/arch/hp700/dev/dino.c +++ b/sys/arch/hppa/dev/dino.c @@ -1,4 +1,4 @@ -/* $NetBSD: dino.c,v 1.37 2013/10/19 13:49:11 skrll Exp $ */ +/* $NetBSD: dino.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.37 2013/10/19 13:49:11 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.1 2014/02/24 07:23:42 skrll Exp $"); /* #include "cardbus.h" */ @@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.37 2013/10/19 13:49:11 skrll Exp $"); #include <machine/intr.h> #include <hppa/include/vmparam.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/dev/cpudevs.h> #if NCARDBUS > 0 #include <dev/cardbus/rbus.h> @@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.37 2013/10/19 13:49:11 skrll Exp $"); #define DINO_MEM_CHUNK 0x800000 /* from machdep.c */ -extern struct extent *hp700_io_extent; +extern struct extent *hppa_io_extent; struct dino_regs { /* HPA Supervisory Register Set */ @@ -117,7 +117,7 @@ struct dino_softc { int sc_ver; void *sc_ih; - struct hp700_interrupt_register sc_ir; + struct hppa_interrupt_register sc_ir; bus_space_tag_t sc_bt; bus_space_handle_t sc_bh; bus_dma_tag_t sc_dmat; @@ -404,7 +404,7 @@ dino_intr_establish(void *v, pci_intr_handle_t ih, { struct dino_softc *sc = v; - return hp700_intr_establish(pri, handler, arg, &sc->sc_ir, ih); + return hppa_intr_establish(pri, handler, arg, &sc->sc_ir, ih); } void @@ -430,7 +430,7 @@ dino_alloc_parent(device_t self, struct pci_attach_args *pa, int io) start = 0xa000; size = 0x1000; } else { - ex = hp700_io_extent; + ex = hppa_io_extent; tag = pa->pa_memt; start = ex->ex_start; /* XXX or 0xf0800000? */ size = DINO_MEM_CHUNK; @@ -1610,8 +1610,8 @@ dinoattach(device_t parent, device_t self, void *aux) sc->sc_bt = ca->ca_iot; sc->sc_dmat = ca->ca_dmatag; - ca->ca_irq = hp700_intr_allocate_bit(&ci->ci_ir, ca->ca_irq); - if (ca->ca_irq == HP700CF_IRQ_UNDEF) { + ca->ca_irq = hppa_intr_allocate_bit(&ci->ci_ir, ca->ca_irq); + if (ca->ca_irq == HPPACF_IRQ_UNDEF) { aprint_error_dev(self, ": can't allocate interrupt"); return; } @@ -1653,14 +1653,14 @@ dinoattach(device_t parent, device_t self, void *aux) r->iar0 = ci->ci_hpa | (31 - ca->ca_irq); splx(s); /* Establish the interrupt register. */ - hp700_interrupt_register_establish(ci, &sc->sc_ir); + hppa_interrupt_register_establish(ci, &sc->sc_ir); sc->sc_ir.ir_name = device_xname(self); sc->sc_ir.ir_mask = &r->imr; sc->sc_ir.ir_req = &r->irr0; sc->sc_ir.ir_level = &r->ilr; /* Add the I/O interrupt register. */ - sc->sc_ih = hp700_intr_establish(IPL_NONE, NULL, &sc->sc_ir, + sc->sc_ih = hppa_intr_establish(IPL_NONE, NULL, &sc->sc_ir, &ci->ci_ir, ca->ca_irq); /* TODO establish the bus error interrupt */ diff --git a/sys/arch/hp700/dev/elroy.c b/sys/arch/hppa/dev/elroy.c index 0e1e6f0d479..1dc6f366341 100644 --- a/sys/arch/hp700/dev/elroy.c +++ b/sys/arch/hppa/dev/elroy.c @@ -1,4 +1,4 @@ -/* $NetBSD: elroy.c,v 1.14 2013/10/19 13:49:11 skrll Exp $ */ +/* $NetBSD: elroy.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $ */ @@ -31,7 +31,7 @@ #include <machine/iomod.h> #include <machine/autoconf.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/dev/cpudevs.h> #if NCARDBUS > 0 #include <dev/cardbus/rbus.h> @@ -41,8 +41,8 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> -#include <hp700/dev/elroyreg.h> -#include <hp700/dev/elroyvar.h> +#include <hppa/dev/elroyreg.h> +#include <hppa/dev/elroyvar.h> #define ELROY_MEM_CHUNK 0x800000 #define ELROY_MEM_WINDOW (2 * ELROY_MEM_CHUNK) diff --git a/sys/arch/hp700/dev/elroyreg.h b/sys/arch/hppa/dev/elroyreg.h index 3f841745b40..e045177f01d 100644 --- a/sys/arch/hp700/dev/elroyreg.h +++ b/sys/arch/hppa/dev/elroyreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: elroyreg.h,v 1.3 2011/10/01 15:51:36 chs Exp $ */ +/* $NetBSD: elroyreg.h,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: elroyreg.h,v 1.1 2007/05/21 22:43:38 kettenis Exp $ */ diff --git a/sys/arch/hp700/dev/elroyvar.h b/sys/arch/hppa/dev/elroyvar.h index bfbc9194ca5..65f345b6a02 100644 --- a/sys/arch/hp700/dev/elroyvar.h +++ b/sys/arch/hppa/dev/elroyvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: elroyvar.h,v 1.6 2011/04/04 20:37:51 dyoung Exp $ */ +/* $NetBSD: elroyvar.h,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: elroyvar.h,v 1.3 2007/06/17 14:51:21 kettenis Exp $ */ diff --git a/sys/arch/hp700/dev/gecko.c b/sys/arch/hppa/dev/gecko.c index 9cabe9bacee..0bca0373e90 100644 --- a/sys/arch/hp700/dev/gecko.c +++ b/sys/arch/hppa/dev/gecko.c @@ -27,7 +27,7 @@ #include <machine/iomod.h> #include <machine/pdc.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/dev/cpudevs.h> struct gecko_softc { device_t sc_dv; diff --git a/sys/arch/hp700/dev/lasi.c b/sys/arch/hppa/dev/lasi.c index 7669a7b7af3..68c0fa75782 100644 --- a/sys/arch/hp700/dev/lasi.c +++ b/sys/arch/hppa/dev/lasi.c @@ -1,4 +1,4 @@ -/* $NetBSD: lasi.c,v 1.25 2014/01/17 07:44:16 skrll Exp $ */ +/* $NetBSD: lasi.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: lasi.c,v 1.4 2001/06/09 03:57:19 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.25 2014/01/17 07:44:16 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.1 2014/02/24 07:23:42 skrll Exp $"); #undef LASIDEBUG @@ -42,9 +42,9 @@ __KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.25 2014/01/17 07:44:16 skrll Exp $"); #include <machine/iomod.h> #include <machine/autoconf.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> +#include <hppa/gsc/gscbusvar.h> struct lasi_hwr { uint32_t lasi_power; @@ -71,7 +71,7 @@ struct lasi_trs { struct lasi_softc { device_t sc_dev; - struct hp700_interrupt_register sc_ir; + struct hppa_interrupt_register sc_ir; struct lasi_hwr volatile *sc_hw; struct lasi_trs volatile *sc_trs; @@ -101,7 +101,7 @@ lasi_fix_args(void *_sc, struct gsc_attach_args *ga) * Determine this module's interrupt bit. */ module_offset = ga->ga_hpa - (hppa_hpa_t) sc->sc_trs; - ga->ga_irq = HP700CF_IRQ_UNDEF; + ga->ga_irq = HPPACF_IRQ_UNDEF; #define LASI_IRQ(off, irq) if (module_offset == off) ga->ga_irq = irq LASI_IRQ(0x2000, 7); /* lpt */ LASI_IRQ(0x4000, 13); /* harmony */ @@ -177,8 +177,8 @@ lasiattach(device_t parent, device_t self, void *aux) aprint_normal(": rev %d.%d\n", (sc->sc_hw->lasi_version & 0xf0) >> 4, sc->sc_hw->lasi_version & 0xf); - ca->ca_irq = hp700_intr_allocate_bit(&ci->ci_ir, ca->ca_irq); - if (ca->ca_irq == HP700CF_IRQ_UNDEF) { + ca->ca_irq = hppa_intr_allocate_bit(&ci->ci_ir, ca->ca_irq); + if (ca->ca_irq == HPPACF_IRQ_UNDEF) { aprint_error(": can't allocate interrupt\n"); return; } @@ -192,7 +192,7 @@ lasiattach(device_t parent, device_t self, void *aux) sc->sc_trs->lasi_imr = 0; /* Establish the interrupt register. */ - hp700_interrupt_register_establish(ci, &sc->sc_ir); + hppa_interrupt_register_establish(ci, &sc->sc_ir); sc->sc_ir.ir_name = device_xname(self); sc->sc_ir.ir_mask = &sc->sc_trs->lasi_imr; sc->sc_ir.ir_req = &sc->sc_trs->lasi_irr; diff --git a/sys/arch/hp700/dev/lcd.c b/sys/arch/hppa/dev/lcd.c index 78a39d559fa..1eb8c3982cf 100644 --- a/sys/arch/hp700/dev/lcd.c +++ b/sys/arch/hppa/dev/lcd.c @@ -1,4 +1,4 @@ -/* $NetBSD: lcd.c,v 1.5 2011/07/01 18:33:09 dyoung Exp $ */ +/* $NetBSD: lcd.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* OpenBSD: lcd.c,v 1.2 2007/07/20 22:13:45 kettenis Exp */ /* diff --git a/sys/arch/hp700/dev/lpt_ssio.c b/sys/arch/hppa/dev/lpt_ssio.c index 1808a263b60..25229e34c8f 100644 --- a/sys/arch/hp700/dev/lpt_ssio.c +++ b/sys/arch/hppa/dev/lpt_ssio.c @@ -25,7 +25,7 @@ #include <dev/ic/lptreg.h> #include <dev/ic/lptvar.h> -#include <hp700/dev/ssiovar.h> +#include <hppa/dev/ssiovar.h> int lpt_ssio_match(device_t, cfdata_t, void *); void lpt_ssio_attach(device_t, device_t, void *); diff --git a/sys/arch/hp700/dev/mem.c b/sys/arch/hppa/dev/mem.c index cf6606555ca..37d86d7df82 100644 --- a/sys/arch/hp700/dev/mem.c +++ b/sys/arch/hppa/dev/mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: mem.c,v 1.28 2011/06/12 03:35:41 rmind Exp $ */ +/* $NetBSD: mem.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: mem.c,v 1.30 2007/09/22 16:21:32 krw Exp $ */ /* @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.28 2011/06/12 03:35:41 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.1 2014/02/24 07:23:42 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,9 +96,9 @@ __KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.28 2011/06/12 03:35:41 rmind Exp $"); #include <machine/autoconf.h> #include <machine/pmap.h> -#include <hp700/hp700/machdep.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/dev/viper.h> +#include <hppa/hppa/machdep.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/dev/viper.h> /* registers on the PCXL2 MIOC */ struct l2_mioc { @@ -176,7 +176,7 @@ memattach(device_t parent, device_t self, void *aux) aprint_normal(":"); - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); /* XXX check if we are dealing w/ Viper */ if (ca->ca_hpa == (hppa_hpa_t)VIPER_HPA) { @@ -243,7 +243,7 @@ memattach(device_t parent, device_t self, void *aux) if (err < 0) pdc_minit.max_spa = PAGE0->imm_max_mem; - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); aprint_normal(" size %d", pdc_minit.max_spa / (1024*1024)); if (pdc_minit.max_spa % (1024*1024)) @@ -293,7 +293,7 @@ viper_eisa_en(void) uint32_t vic; int s; - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); s = splhigh(); vic = VI_CTRL; ((struct vi_ctrl *)&vic)->eisa_den = 0; @@ -301,6 +301,6 @@ viper_eisa_en(void) __asm __volatile("stwas %1, 0(%0)" :: "r" (&VI_CTRL), "r" (vic) : "memory"); splx(s); - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); } } diff --git a/sys/arch/hp700/dev/mongoose.c b/sys/arch/hppa/dev/mongoose.c index 59a949320ed..4084d9df1c5 100644 --- a/sys/arch/hp700/dev/mongoose.c +++ b/sys/arch/hppa/dev/mongoose.c @@ -1,4 +1,4 @@ -/* $NetBSD: mongoose.c,v 1.23 2012/05/23 16:11:37 skrll Exp $ */ +/* $NetBSD: mongoose.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: mongoose.c,v 1.19 2010/01/01 20:28:42 kettenis Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.23 2012/05/23 16:11:37 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.1 2014/02/24 07:23:42 skrll Exp $"); #define MONGOOSE_DEBUG 9 @@ -42,8 +42,8 @@ __KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.23 2012/05/23 16:11:37 skrll Exp $"); #include <machine/iomod.h> #include <machine/autoconf.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/dev/viper.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/dev/viper.h> #include <dev/eisa/eisareg.h> #include <dev/eisa/eisavar.h> @@ -617,8 +617,8 @@ mgattach(device_t parent, device_t self, void *aux) return; } - ca->ca_irq = hp700_intr_allocate_bit(&ci->ci_ir, ca->ca_irq); - if (ca->ca_irq == HP700CF_IRQ_UNDEF) { + ca->ca_irq = hppa_intr_allocate_bit(&ci->ci_ir, ca->ca_irq); + if (ca->ca_irq == HPPACF_IRQ_UNDEF) { aprint_error(": can't allocate interrupt\n"); return; } @@ -716,6 +716,6 @@ mgattach(device_t parent, device_t self, void *aux) #undef R /* attach interrupt */ - sc->sc_ih = hp700_intr_establish(IPL_NONE, mg_intr, sc, &ci->ci_ir, + sc->sc_ih = hppa_intr_establish(IPL_NONE, mg_intr, sc, &ci->ci_ir, ca->ca_irq); } diff --git a/sys/arch/hp700/dev/pdc.c b/sys/arch/hppa/dev/pdc.c index 39d98d44107..7678a00fef1 100644 --- a/sys/arch/hp700/dev/pdc.c +++ b/sys/arch/hppa/dev/pdc.c @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.c,v 1.43 2013/10/25 09:46:10 martin Exp $ */ +/* $NetBSD: pdc.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: pdc.c,v 1.14 2001/04/29 21:05:43 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pdc.c,v 1.43 2013/10/25 09:46:10 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pdc.c,v 1.1 2014/02/24 07:23:42 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -47,8 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: pdc.c,v 1.43 2013/10/25 09:46:10 martin Exp $"); #include <machine/iomod.h> #include <machine/autoconf.h> -#include <hp700/hp700/machdep.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/hppa/machdep.h> +#include <hppa/dev/cpudevs.h> typedef struct pdc_softc { @@ -110,7 +110,7 @@ pdc_init(void) int err; int pagezero_cookie; - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); pz_kbd = &PAGE0->mem_kbd; pz_cons = &PAGE0->mem_cons; @@ -128,7 +128,7 @@ pdc_init(void) #endif } - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); pdc_cniodc = (iodcio_t)cn_iodc; pdc_kbdiodc = (iodcio_t)kbd_iodc; @@ -463,12 +463,12 @@ pdccnlookc(dev_t dev, int *cp) int s, err __debugused, l, pagezero_cookie; s = splhigh(); - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); err = pdc_call(pdc_kbdiodc, 0, pz_kbd->pz_hpa, IODC_IO_CONSIN, pz_kbd->pz_spa, pz_kbd->pz_layers, &pdcret1, 0, pdc_consbuf, 1, 0); l = pdcret1.result[0]; *cp = pdc_consbuf[0]; - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); splx(s); #ifdef DEBUG @@ -496,11 +496,11 @@ pdccnputc(dev_t dev, int c) int s, err, pagezero_cookie; s = splhigh(); - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); *pdc_consbuf = c; err = pdc_call(pdc_cniodc, 0, pz_cons->pz_hpa, IODC_IO_CONSOUT, pz_cons->pz_spa, pz_cons->pz_layers, &pdcret1, 0, pdc_consbuf, 1, 0); - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); splx(s); if (err < 0) { diff --git a/sys/arch/hp700/dev/phantomas.c b/sys/arch/hppa/dev/phantomas.c index c1ff846967d..1e5cfae340a 100644 --- a/sys/arch/hp700/dev/phantomas.c +++ b/sys/arch/hppa/dev/phantomas.c @@ -1,4 +1,4 @@ -/* $NetBSD: phantomas.c,v 1.8 2011/01/13 21:15:14 skrll Exp $ */ +/* $NetBSD: phantomas.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: phantomas.c,v 1.1 2002/12/18 23:52:45 mickey Exp $ */ /* @@ -34,7 +34,7 @@ #include <machine/iomod.h> #include <machine/autoconf.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/dev/cpudevs.h> struct phantomas_softc { device_t sc_dev; diff --git a/sys/arch/hp700/dev/power.c b/sys/arch/hppa/dev/power.c index 56ed775017b..aede3e738cd 100644 --- a/sys/arch/hp700/dev/power.c +++ b/sys/arch/hppa/dev/power.c @@ -1,4 +1,4 @@ -/* $NetBSD: power.c,v 1.7 2012/05/23 16:11:37 skrll Exp $ */ +/* $NetBSD: power.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* * Copyright (c) 2004 Jochen Kunz. @@ -69,7 +69,7 @@ #include <machine/pdc.h> #include <machine/autoconf.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/dev/cpudevs.h> #include <dev/sysmon/sysmon_taskq.h> #include <dev/sysmon/sysmonvar.h> diff --git a/sys/arch/hp700/dev/siop_sgc.c b/sys/arch/hppa/dev/siop_sgc.c index df9b2fb9a41..079295023b6 100644 --- a/sys/arch/hp700/dev/siop_sgc.c +++ b/sys/arch/hppa/dev/siop_sgc.c @@ -1,4 +1,4 @@ -/* $NetBSD: siop_sgc.c,v 1.10 2012/05/23 16:11:37 skrll Exp $ */ +/* $NetBSD: siop_sgc.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */ /* $OpenBSD: siop_sgc.c,v 1.1 2007/08/05 19:09:52 kettenis Exp $ */ @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.10 2012/05/23 16:11:37 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.1 2014/02/24 07:23:42 skrll Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.10 2012/05/23 16:11:37 skrll Exp $"); #include <dev/ic/siopvar_common.h> #include <dev/ic/siopvar.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/dev/cpudevs.h> #define IO_II_INTEN 0x20000000 #define IO_II_PACKEN 0x10000000 @@ -94,8 +94,8 @@ siop_sgc_attach(device_t parent, device_t self, void *aux) return; } - ca->ca_irq = hp700_intr_allocate_bit(&ci->ci_ir, ca->ca_irq); - if (ca->ca_irq == HP700CF_IRQ_UNDEF) { + ca->ca_irq = hppa_intr_allocate_bit(&ci->ci_ir, ca->ca_irq); + if (ca->ca_irq == HPPACF_IRQ_UNDEF) { aprint_error(": can't allocate interrupt\n"); return; } @@ -136,7 +136,7 @@ siop_sgc_attach(device_t parent, device_t self, void *aux) siop_attach(&sgc->sc_siop); - (void)hp700_intr_establish(IPL_BIO, siop_intr, sc, &ci->ci_ir, + (void)hppa_intr_establish(IPL_BIO, siop_intr, sc, &ci->ci_ir, ca->ca_irq); } diff --git a/sys/arch/hp700/dev/ssio.c b/sys/arch/hppa/dev/ssio.c index 90f82830559..50537d6486b 100644 --- a/sys/arch/hp700/dev/ssio.c +++ b/sys/arch/hppa/dev/ssio.c @@ -1,4 +1,4 @@ -/* $NetBSD: ssio.c,v 1.4 2012/10/10 16:51:10 skrll Exp $ */ +/* $NetBSD: ssio.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: ssio.c,v 1.7 2009/03/08 22:19:04 miod Exp $ */ @@ -34,8 +34,8 @@ #include <dev/pci/pcidevs.h> #include <dev/pci/pciidereg.h> -#include <hp700/hp700/machdep.h> -#include <hp700/dev/ssiovar.h> +#include <hppa/hppa/machdep.h> +#include <hppa/dev/ssiovar.h> #include "ukbd.h" #if NUKBD > 0 @@ -294,11 +294,11 @@ ssio_attach(device_t parent, device_t self, void *aux) tag = pci_make_tag(pa->pa_pc, pa->pa_bus, pa->pa_device, 2); reg = pci_conf_read(pa->pa_pc, tag, PCI_CBMEM); - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); if (PAGE0->mem_kbd.pz_class == PCL_KEYBD && PAGE0->mem_kbd.pz_hpa == (struct iomod *)reg) ukbd_cnattach(); - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); #endif return; diff --git a/sys/arch/hp700/dev/ssiovar.h b/sys/arch/hppa/dev/ssiovar.h index b9aaf117c1f..c00a8f61656 100644 --- a/sys/arch/hp700/dev/ssiovar.h +++ b/sys/arch/hppa/dev/ssiovar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ssiovar.h,v 1.1 2009/05/29 12:33:34 skrll Exp $ */ +/* $NetBSD: ssiovar.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: ssiovar.h,v 1.1 2007/06/19 22:51:26 kettenis Exp $ */ diff --git a/sys/arch/hp700/dev/sti_pci_machdep.c b/sys/arch/hppa/dev/sti_pci_machdep.c index 4101f24f3cf..ca59e6daece 100644 --- a/sys/arch/hp700/dev/sti_pci_machdep.c +++ b/sys/arch/hppa/dev/sti_pci_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: sti_pci_machdep.c,v 1.1 2010/11/09 12:24:47 skrll Exp $ */ +/* $NetBSD: sti_pci_machdep.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: sti_pci_machdep.c,v 1.2 2009/04/10 17:11:27 miod Exp $ */ @@ -28,7 +28,7 @@ #include <dev/pci/pcivar.h> -#include <hp700/hp700/machdep.h> +#include <hppa/hppa/machdep.h> int sti_pci_is_console(struct pci_attach_args *, bus_addr_t *); @@ -43,9 +43,9 @@ sti_pci_is_console(struct pci_attach_args *paa, bus_addr_t *bases) KASSERT(paa != NULL); - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); consaddr = (hppa_hpa_t)PAGE0->mem_cons.pz_hpa; - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); /* * PAGE0 console information will point to one of our BARs, * but depending on the particular sti model, this might not diff --git a/sys/arch/hp700/dev/sti_sgc.c b/sys/arch/hppa/dev/sti_sgc.c index b684d4893e5..61055b8da9e 100644 --- a/sys/arch/hp700/dev/sti_sgc.c +++ b/sys/arch/hppa/dev/sti_sgc.c @@ -1,4 +1,4 @@ -/* $NetBSD: sti_sgc.c,v 1.22 2013/10/19 13:28:36 skrll Exp $ */ +/* $NetBSD: sti_sgc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: sti_sgc.c,v 1.38 2009/02/06 22:51:04 miod Exp $ */ @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.22 2013/10/19 13:28:36 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include "opt_cputype.h" @@ -56,8 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.22 2013/10/19 13:28:36 skrll Exp $"); #include <dev/ic/stireg.h> #include <dev/ic/stivar.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/hp700/machdep.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/hppa/machdep.h> #ifdef STIDEBUG #define DPRINTF(s) do { \ @@ -114,9 +114,9 @@ sti_sgc_getrom(struct confargs *ca) paddr_t rom; int pagezero_cookie; - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); rom = PAGE0->pd_resv2[1]; - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); if (ca->ca_type.iodc_sv_model == HPPA_FIO_GSGC) { int i; @@ -232,9 +232,9 @@ sti_sgc_attach(device_t parent, device_t self, void *aux) int rv; int i; - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); consaddr = (hppa_hpa_t)PAGE0->mem_cons.pz_hpa; - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); sc->sc_dev = self; sc->sc_enable_rom = NULL; diff --git a/sys/arch/hp700/dev/uturn.c b/sys/arch/hppa/dev/uturn.c index 5dbde32ae2e..a2880a63524 100644 --- a/sys/arch/hp700/dev/uturn.c +++ b/sys/arch/hppa/dev/uturn.c @@ -1,4 +1,4 @@ -/* $NetBSD: uturn.c,v 1.19 2012/01/27 21:05:38 skrll Exp $ */ +/* $NetBSD: uturn.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: uturn.c,v 1.6 2007/12/29 01:26:14 kettenis Exp $ */ @@ -96,7 +96,7 @@ #include <machine/iomod.h> #include <machine/autoconf.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/dev/cpudevs.h> #define UTURNDEBUG #ifdef UTURNDEBUG diff --git a/sys/arch/hp700/dev/viper.h b/sys/arch/hppa/dev/viper.h index 8c06b0c4985..6354d9d97b4 100644 --- a/sys/arch/hp700/dev/viper.h +++ b/sys/arch/hppa/dev/viper.h @@ -1,4 +1,4 @@ -/* $NetBSD: viper.h,v 1.4 2009/05/08 09:33:58 skrll Exp $ */ +/* $NetBSD: viper.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: viper.h,v 1.2 1999/06/29 20:56:10 mickey Exp $ */ diff --git a/sys/arch/hp700/dev/wax.c b/sys/arch/hppa/dev/wax.c index b31c60732a8..b17e95ccbfe 100644 --- a/sys/arch/hp700/dev/wax.c +++ b/sys/arch/hppa/dev/wax.c @@ -1,4 +1,4 @@ -/* $NetBSD: wax.c,v 1.22 2013/10/19 13:49:11 skrll Exp $ */ +/* $NetBSD: wax.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: wax.c,v 1.1 1998/11/23 03:04:10 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.22 2013/10/19 13:49:11 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -39,9 +39,9 @@ __KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.22 2013/10/19 13:49:11 skrll Exp $"); #include <machine/iomod.h> #include <machine/autoconf.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> +#include <hppa/gsc/gscbusvar.h> #define WAX_IOMASK 0xfff00000 #define WAX_REGS 0xc000 @@ -56,7 +56,7 @@ struct wax_regs { struct wax_softc { device_t sc_dv; - struct hp700_interrupt_register sc_ir; + struct hppa_interrupt_register sc_ir; struct wax_regs volatile *sc_regs; }; @@ -83,7 +83,7 @@ wax_fix_args(void *_sc, struct gsc_attach_args *ga) * Determine this module's interrupt bit. */ module_offset = ga->ga_hpa - (hppa_hpa_t) sc->sc_regs; - ga->ga_irq = HP700CF_IRQ_UNDEF; + ga->ga_irq = HPPACF_IRQ_UNDEF; if (module_offset == 0x1000) /* hil */ ga->ga_irq = 1; if (module_offset == 0x2000) /* com */ @@ -114,8 +114,8 @@ waxattach(device_t parent, device_t self, void *aux) bus_space_handle_t ioh; int s; - ca->ca_irq = hp700_intr_allocate_bit(&ci->ci_ir, ca->ca_irq); - if (ca->ca_irq == HP700CF_IRQ_UNDEF) { + ca->ca_irq = hppa_intr_allocate_bit(&ci->ci_ir, ca->ca_irq); + if (ca->ca_irq == HPPACF_IRQ_UNDEF) { aprint_error(": can't allocate interrupt\n"); return; } @@ -145,7 +145,7 @@ waxattach(device_t parent, device_t self, void *aux) splx(s); /* Establish the interrupt register. */ - hp700_interrupt_register_establish(ci, &sc->sc_ir); + hppa_interrupt_register_establish(ci, &sc->sc_ir); sc->sc_ir.ir_name = device_xname(self); sc->sc_ir.ir_mask = &sc->sc_regs->wax_imr; sc->sc_ir.ir_req = &sc->sc_regs->wax_irr; diff --git a/sys/arch/hp700/gsc/com_gsc.c b/sys/arch/hppa/gsc/com_gsc.c index 56be6182d9a..e52346bad77 100644 --- a/sys/arch/hp700/gsc/com_gsc.c +++ b/sys/arch/hppa/gsc/com_gsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_gsc.c,v 1.17 2011/07/01 18:33:09 dyoung Exp $ */ +/* $NetBSD: com_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: com_gsc.c,v 1.8 2000/03/13 14:39:59 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.17 2011/07/01 18:33:09 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include "opt_kgdb.h" @@ -50,9 +50,9 @@ __KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.17 2011/07/01 18:33:09 dyoung Exp $"); #include <dev/ic/comreg.h> #include <dev/ic/comvar.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> -#include <hp700/hp700/machdep.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/gsc/gscbusvar.h> +#include <hppa/hppa/machdep.h> #define COMGSC_OFFSET 0x800 #define COMGSC_FREQUENCY (1843200 * 4) /* 16-bit baud rate divisor */ @@ -106,7 +106,7 @@ com_gsc_attach(device_t parent, device_t self, void *aux) sc->sc_frequency = COMGSC_FREQUENCY; /* Test if this is the console. Compare either HPA or device path. */ - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); if ((hppa_hpa_t)PAGE0->mem_cons.pz_hpa == ga->ga_hpa ) { /* @@ -119,11 +119,11 @@ com_gsc_attach(device_t parent, device_t self, void *aux) sc->sc_frequency, COM_TYPE_NORMAL, (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8) != 0) { aprint_error(": can't comcnattach\n"); - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); return; } } - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); /* * Get the already initialized console ioh via com_is_console() if @@ -138,7 +138,7 @@ com_gsc_attach(device_t parent, device_t self, void *aux) COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase); com_attach_subr(sc); - gsc->sc_ih = hp700_intr_establish(IPL_TTY, comintr, sc, ga->ga_ir, + gsc->sc_ih = hppa_intr_establish(IPL_TTY, comintr, sc, ga->ga_ir, ga->ga_irq); } diff --git a/sys/arch/hp700/gsc/fdc_gsc.c b/sys/arch/hppa/gsc/fdc_gsc.c index 6cf2a529568..fa52de14d47 100644 --- a/sys/arch/hp700/gsc/fdc_gsc.c +++ b/sys/arch/hppa/gsc/fdc_gsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: fdc_gsc.c,v 1.11 2012/10/10 17:00:37 skrll Exp $ */ +/* $NetBSD: fdc_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: fdc_gsc.c,v 1.1 1998/09/30 04:45:46 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fdc_gsc.c,v 1.11 2012/10/10 17:00:37 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdc_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_gsc.c,v 1.11 2012/10/10 17:00:37 skrll Exp $"); #include <dev/ic/fdreg.h> #include <dev/ic/fdlink.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/dev/cpudevs.h> /* controller driver configuration */ int fdc_gsc_probe(device_t, cfdata_t, void *); diff --git a/sys/arch/hp700/gsc/gscbus.c b/sys/arch/hppa/gsc/gscbus.c index 8a8964c65c8..89adb6601b1 100644 --- a/sys/arch/hp700/gsc/gscbus.c +++ b/sys/arch/hppa/gsc/gscbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: gscbus.c,v 1.23 2012/05/23 16:11:37 skrll Exp $ */ +/* $NetBSD: gscbus.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: gscbus.c,v 1.13 2001/08/01 20:32:04 miod Exp $ */ @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.23 2012/05/23 16:11:37 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #define GSCDEBUG @@ -85,8 +85,8 @@ __KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.23 2012/05/23 16:11:37 skrll Exp $"); #include <machine/autoconf.h> #include <machine/cpufunc.h> -#include <hp700/gsc/gscbusvar.h> -#include <hp700/hp700/machdep.h> +#include <hppa/gsc/gscbusvar.h> +#include <hppa/hppa/machdep.h> int gscmatch(device_t, cfdata_t, void *); void gscattach(device_t, device_t, void *); @@ -150,7 +150,7 @@ gscattach(device_t parent, device_t self, void *aux) /* Add the I/O subsystem's interrupt register. */ ga->ga_ir->ir_name = device_xname(self); - sc->sc_ih = hp700_intr_establish(IPL_NONE, NULL, ga->ga_ir, + sc->sc_ih = hppa_intr_establish(IPL_NONE, NULL, ga->ga_ir, &ci->ci_ir, ga->ga_irq); ga->ga_ca.ca_nmodules = MAXMODBUS; diff --git a/sys/arch/hp700/gsc/gscbusvar.h b/sys/arch/hppa/gsc/gscbusvar.h index 888126e58d1..60bafe380d2 100644 --- a/sys/arch/hp700/gsc/gscbusvar.h +++ b/sys/arch/hppa/gsc/gscbusvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: gscbusvar.h,v 1.11 2012/05/23 16:11:37 skrll Exp $ */ +/* $NetBSD: gscbusvar.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: gscbusvar.h,v 1.3 1999/08/16 02:48:39 mickey Exp $ */ @@ -43,7 +43,7 @@ struct gsc_attach_args { /*#define ga_pdc_iodc_read ga_ca.ca_pdc_iodc_read */ /* The interrupt register for this GSC bus. */ - struct hp700_interrupt_register *ga_ir; + struct hppa_interrupt_register *ga_ir; /* This fixes a module's attach arguments. */ void (*ga_fix_args)(void *, struct gsc_attach_args *); diff --git a/sys/arch/hp700/gsc/gsckbc.c b/sys/arch/hppa/gsc/gsckbc.c index 5f560bba9a8..22c030ea5d7 100644 --- a/sys/arch/hp700/gsc/gsckbc.c +++ b/sys/arch/hppa/gsc/gsckbc.c @@ -1,4 +1,4 @@ -/* $NetBSD: gsckbc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $ */ +/* $NetBSD: gsckbc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* * Copyright (c) 2004 Jochen Kunz. * All rights reserved. @@ -29,11 +29,11 @@ */ /* - * hp700 GSC bus MD pckbport(9) frontend for the PS/2 ports found in LASI chips. + * hppa GSC bus MD pckbport(9) frontend for the PS/2 ports found in LASI chips. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); /* autoconfig and device stuff */ #include <sys/param.h> @@ -41,9 +41,9 @@ __KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $"); #include <sys/conf.h> #include <machine/iomod.h> #include <machine/autoconf.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> -#include <hp700/hp700/machdep.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/gsc/gscbusvar.h> +#include <hppa/hppa/machdep.h> #include "locators.h" #include "ioconf.h" @@ -246,7 +246,7 @@ gsckbc_attach(device_t parent, device_t self, void *aux) int i; /* - * On hp700 bus_space_map(9) mapes whole pages. (surprise, surprise) + * On hppa bus_space_map(9) mapes whole pages. (surprise, surprise) * The registers are within the same page so we can do only a single * mapping for both devices. Also both devices use the same IRQ. * Actually you can think of the two PS/2 ports to be a single @@ -267,7 +267,7 @@ gsckbc_attach(device_t parent, device_t self, void *aux) return; } aprint_debug(" (master)"); - sc->sc_ih = hp700_intr_establish(IPL_TTY, gsckbc_intr, sc, + sc->sc_ih = hppa_intr_establish(IPL_TTY, gsckbc_intr, sc, ga->ga_ir, ga->ga_irq); master_sc = sc; } else { @@ -292,7 +292,7 @@ gsckbc_attach(device_t parent, device_t self, void *aux) if (bus_space_read_1(sc->sc_iot, sc->sc_ioh, REG_ID) == ID_KBD) { aprint_normal(": keyboard\n"); sc->sc_slot = PCKBPORT_KBD_SLOT; - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); if ((hppa_hpa_t)PAGE0->mem_kbd.pz_hpa == ga->ga_hpa) { if (pckbport_cnattach(sc, &gsckbc_accessops, sc->sc_slot) != 0) @@ -301,7 +301,7 @@ gsckbc_attach(device_t parent, device_t self, void *aux) else sc->sc_enable = 1; } - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); } else { aprint_normal(": mouse\n"); sc->sc_slot = PCKBPORT_AUX_SLOT; diff --git a/sys/arch/hp700/gsc/harmony.c b/sys/arch/hppa/gsc/harmony.c index 274431673f5..b2e0edd6add 100644 --- a/sys/arch/hp700/gsc/harmony.c +++ b/sys/arch/hppa/gsc/harmony.c @@ -1,4 +1,4 @@ -/* $NetBSD: harmony.c,v 1.28 2013/10/19 13:18:03 skrll Exp $ */ +/* $NetBSD: harmony.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */ @@ -85,10 +85,10 @@ #include <machine/autoconf.h> #include <sys/bus.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> -#include <hp700/gsc/harmonyreg.h> -#include <hp700/gsc/harmonyvar.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/gsc/gscbusvar.h> +#include <hppa/gsc/harmonyreg.h> +#include <hppa/gsc/harmonyvar.h> int harmony_open(void *, int); void harmony_close(void *); @@ -285,7 +285,7 @@ harmony_attach(device_t parent, device_t self, void *aux) offsetof(struct harmony_empty, playback[0][0]), PLAYBACK_EMPTYS * HARMONY_BUFSIZE, BUS_DMASYNC_PREWRITE); - (void) hp700_intr_establish(IPL_AUDIO, harmony_intr, sc, ga->ga_ir, + (void) hppa_intr_establish(IPL_AUDIO, harmony_intr, sc, ga->ga_ir, ga->ga_irq); /* set defaults */ diff --git a/sys/arch/hp700/gsc/harmonyreg.h b/sys/arch/hppa/gsc/harmonyreg.h index 499f8e22044..11890448d65 100644 --- a/sys/arch/hp700/gsc/harmonyreg.h +++ b/sys/arch/hppa/gsc/harmonyreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: harmonyreg.h,v 1.3 2008/09/23 14:07:11 mjf Exp $ */ +/* $NetBSD: harmonyreg.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: harmonyreg.h,v 1.5 2003/06/02 19:54:29 jason Exp $ */ diff --git a/sys/arch/hp700/gsc/harmonyvar.h b/sys/arch/hppa/gsc/harmonyvar.h index 1d7dd95045b..2b9115bdbb5 100644 --- a/sys/arch/hp700/gsc/harmonyvar.h +++ b/sys/arch/hppa/gsc/harmonyvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: harmonyvar.h,v 1.7 2012/02/02 19:42:59 tls Exp $ */ +/* $NetBSD: harmonyvar.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: harmonyvar.h,v 1.8 2003/08/15 13:25:53 mickey Exp $ */ diff --git a/sys/arch/hp700/gsc/hil_gsc.c b/sys/arch/hppa/gsc/hil_gsc.c index 86f0445ff90..ab7c4c0a4a0 100644 --- a/sys/arch/hp700/gsc/hil_gsc.c +++ b/sys/arch/hppa/gsc/hil_gsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: hil_gsc.c,v 1.2 2011/02/15 10:35:39 tsutsui Exp $ */ +/* $NetBSD: hil_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: hil_gsc.c,v 1.5 2005/12/22 07:09:52 miod Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. @@ -37,9 +37,9 @@ #include <machine/iomod.h> #include <machine/autoconf.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> -#include <hp700/hp700/machdep.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/gsc/gscbusvar.h> +#include <hppa/hppa/machdep.h> #include <machine/hil_machdep.h> @@ -85,14 +85,14 @@ hil_gsc_attach(device_t parent, device_t self, void *aux) return; } - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); gsc->sc_hil_console = ga->ga_dp.dp_mod == PAGE0->mem_kbd.pz_dp.dp_mod && memcmp(ga->ga_dp.dp_bc, PAGE0->mem_kbd.pz_dp.dp_bc, 6) == 0; - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); hil_attach(sc, &gsc->sc_hil_console); - gsc->sc_ih = hp700_intr_establish(IPL_TTY, hil_intr, sc, + gsc->sc_ih = hppa_intr_establish(IPL_TTY, hil_intr, sc, ga->ga_ir, ga->ga_irq); config_interrupts(self, hil_attach_deferred); diff --git a/sys/arch/hp700/gsc/if_ie_gsc.c b/sys/arch/hppa/gsc/if_ie_gsc.c index 9fa7b6c6a17..9255ca4c4f1 100644 --- a/sys/arch/hp700/gsc/if_ie_gsc.c +++ b/sys/arch/hppa/gsc/if_ie_gsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ie_gsc.c,v 1.26 2012/02/04 16:31:19 skrll Exp $ */ +/* $NetBSD: if_ie_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: if_ie_gsc.c,v 1.6 2001/01/12 22:57:04 mickey Exp $ */ @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,v 1.26 2012/02/04 16:31:19 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,9 +61,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,v 1.26 2012/02/04 16:31:19 skrll Exp $") #include <machine/iomod.h> #include <machine/autoconf.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> -#include <hp700/hp700/machdep.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/gsc/gscbusvar.h> +#include <hppa/hppa/machdep.h> #include <dev/ic/i82586reg.h> #include <dev/ic/i82586var.h> @@ -96,7 +96,7 @@ struct ie_gsc_regs { struct ie_gsc_softc { struct ie_softc ie; - /* tag and handle to hp700-specific adapter registers. */ + /* tag and handle to hppa-specific adapter registers. */ bus_space_tag_t iot; bus_space_handle_t ioh; @@ -285,7 +285,7 @@ ie_gsc_memcopyin(struct ie_softc *sc, void *p, int offset, size_t size) memcpy(p, (char *)sc->sc_maddr + offset, size); bus_dmamap_sync(gsc->iemt, sc->sc_dmamap, offset, size, BUS_DMASYNC_PREREAD); - hp700_led_blink(HP700_LED_NETRCV); + hppa_led_blink(HPPA_LED_NETRCV); } void @@ -299,7 +299,7 @@ ie_gsc_memcopyout(struct ie_softc *sc, const void *p, int offset, size_t size) memcpy((char *)sc->sc_maddr + offset, p, size); bus_dmamap_sync(gsc->iemt, sc->sc_dmamap, offset, size, BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); - hp700_led_blink(HP700_LED_NETSND); + hppa_led_blink(HPPA_LED_NETSND); } /* @@ -550,6 +550,6 @@ ie_gsc_attach(device_t parent, device_t self, void *aux) "LASI/i82596CA" : "i82596DX", myaddr, ie_gsc_media, IE_NMEDIA, ie_gsc_media[0]); - gsc->sc_ih = hp700_intr_establish(IPL_NET, i82586_intr, sc, + gsc->sc_ih = hppa_intr_establish(IPL_NET, i82586_intr, sc, ga->ga_ir, ga->ga_irq); } diff --git a/sys/arch/hp700/gsc/if_iee_gsc.c b/sys/arch/hppa/gsc/if_iee_gsc.c index 6bf51bead6e..838bb10a03c 100644 --- a/sys/arch/hp700/gsc/if_iee_gsc.c +++ b/sys/arch/hppa/gsc/if_iee_gsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iee_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $ */ +/* $NetBSD: if_iee_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* * Copyright (c) 2003 Jochen Kunz. @@ -30,11 +30,11 @@ */ /* - * hp700 GSC bus MD frontend for the iee(4) Intel i82596 Ethernet driver. + * hppa GSC bus MD frontend for the iee(4) Intel i82596 Ethernet driver. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iee_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iee_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); /* autoconfig and device stuff */ #include <sys/param.h> @@ -42,8 +42,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_iee_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $ #include <sys/conf.h> #include <machine/iomod.h> #include <machine/autoconf.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/gsc/gscbusvar.h> #include "locators.h" #include "ioconf.h" @@ -249,7 +249,7 @@ iee_gsc_attach(device_t parent, device_t self, void *aux) sc->sc_flags = IEE_NEED_SWAP; } - sc_gsc->sc_ih = hp700_intr_establish(IPL_NET, iee_intr, sc, + sc_gsc->sc_ih = hppa_intr_establish(IPL_NET, iee_intr, sc, ga->ga_ir, ga->ga_irq); sc->sc_iee_reset = iee_gsc_reset; @@ -270,6 +270,6 @@ iee_gsc_detach(device_t self, int flags) iee_detach(sc, flags); bus_space_unmap(sc_gsc->sc_iot, sc_gsc->sc_ioh, IEE_GSC_IO_SZ); - /* There is no hp700_intr_disestablish()! */ + /* There is no hppa_intr_disestablish()! */ return 0; } diff --git a/sys/arch/hp700/gsc/lpt_gsc.c b/sys/arch/hppa/gsc/lpt_gsc.c index c0600f4d2a2..0dcfb6369e7 100644 --- a/sys/arch/hp700/gsc/lpt_gsc.c +++ b/sys/arch/hppa/gsc/lpt_gsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_gsc.c,v 1.15 2013/10/19 14:01:42 skrll Exp $ */ +/* $NetBSD: lpt_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: lpt_gsc.c,v 1.6 2000/07/21 17:41:06 mickey Exp $ */ @@ -53,7 +53,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt_gsc.c,v 1.15 2013/10/19 14:01:42 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -67,9 +67,9 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_gsc.c,v 1.15 2013/10/19 14:01:42 skrll Exp $"); #include <dev/ic/lptreg.h> #include <dev/ic/lptvar.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> +#include <hppa/gsc/gscbusvar.h> #define LPTGSC_OFFSET 0x800 @@ -213,7 +213,7 @@ lpt_gsc_attach(device_t parent, device_t self, void *aux) lpt_attach_subr(sc); - sc->sc_ih = hp700_intr_establish(IPL_TTY, lptintr, sc, ga->ga_ir, + sc->sc_ih = hppa_intr_establish(IPL_TTY, lptintr, sc, ga->ga_ir, ga->ga_irq); aprint_normal("\n"); } diff --git a/sys/arch/hp700/gsc/oosiop_gsc.c b/sys/arch/hppa/gsc/oosiop_gsc.c index 174d184ae13..a65718e40aa 100644 --- a/sys/arch/hp700/gsc/oosiop_gsc.c +++ b/sys/arch/hppa/gsc/oosiop_gsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: oosiop_gsc.c,v 1.13 2011/07/01 18:33:09 dyoung Exp $ */ +/* $NetBSD: oosiop_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* * Copyright (c) 2001 Matt Fredette. All rights reserved. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: oosiop_gsc.c,v 1.13 2011/07/01 18:33:09 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: oosiop_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -101,9 +101,9 @@ __KERNEL_RCSID(0, "$NetBSD: oosiop_gsc.c,v 1.13 2011/07/01 18:33:09 dyoung Exp $ #include <dev/ic/oosiopreg.h> #include <dev/ic/oosiopvar.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> -#include <hp700/hp700/machdep.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/gsc/gscbusvar.h> +#include <hppa/hppa/machdep.h> #define OOSIOP_GSC_RESET 0x0000 #define OOSIOP_GSC_OFFSET 0x0100 @@ -174,7 +174,7 @@ oosiop_gsc_attach(device_t parent, device_t self, void *aux) */ oosiop_attach(sc); - (void)hp700_intr_establish(IPL_BIO, oosiop_gsc_intr, sc, + (void)hppa_intr_establish(IPL_BIO, oosiop_gsc_intr, sc, ga->ga_ir, ga->ga_irq); } @@ -190,7 +190,7 @@ oosiop_gsc_intr(void *arg) rv = oosiop_intr(sc); /* Blink the LED. */ - hp700_led_blink(HP700_LED_DISK); + hppa_led_blink(HPPA_LED_DISK); return rv; } diff --git a/sys/arch/hp700/gsc/osiop_gsc.c b/sys/arch/hppa/gsc/osiop_gsc.c index 711dc8a0f57..653623fe53f 100644 --- a/sys/arch/hp700/gsc/osiop_gsc.c +++ b/sys/arch/hppa/gsc/osiop_gsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: osiop_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $ */ +/* $NetBSD: osiop_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* * Copyright (c) 2001 Matt Fredette. All rights reserved. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osiop_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osiop_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -101,9 +101,9 @@ __KERNEL_RCSID(0, "$NetBSD: osiop_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $" #include <dev/ic/osiopreg.h> #include <dev/ic/osiopvar.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> -#include <hp700/hp700/machdep.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/gsc/gscbusvar.h> +#include <hppa/hppa/machdep.h> #define OSIOP_GSC_RESET 0x0000 #define OSIOP_GSC_OFFSET 0x0100 @@ -183,7 +183,7 @@ osiop_gsc_attach(device_t parent, device_t self, void *aux) #endif /* OSIOP_DEBUG */ osiop_attach(sc); - (void)hp700_intr_establish(IPL_BIO, osiop_gsc_intr, sc, ga->ga_ir, + (void)hppa_intr_establish(IPL_BIO, osiop_gsc_intr, sc, ga->ga_ir, ga->ga_irq); } @@ -221,7 +221,7 @@ osiop_gsc_intr(void *arg) osiop_intr(sc); /* Blink the LED. */ - hp700_led_blink(HP700_LED_DISK); + hppa_led_blink(HPPA_LED_DISK); return (1); } diff --git a/sys/arch/hp700/gsc/siop_gsc.c b/sys/arch/hppa/gsc/siop_gsc.c index 8d188f2cea3..f301239844d 100644 --- a/sys/arch/hp700/gsc/siop_gsc.c +++ b/sys/arch/hppa/gsc/siop_gsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: siop_gsc.c,v 1.14 2011/07/01 18:33:09 dyoung Exp $ */ +/* $NetBSD: siop_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: siop_gsc.c,v 1.4 2007/08/23 21:01:22 kettenis Exp $ */ @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: siop_gsc.c,v 1.14 2011/07/01 18:33:09 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siop_gsc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -39,8 +39,8 @@ __KERNEL_RCSID(0, "$NetBSD: siop_gsc.c,v 1.14 2011/07/01 18:33:09 dyoung Exp $") #include <dev/ic/siopvar_common.h> #include <dev/ic/siopvar.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/gsc/gscbusvar.h> #define SIOP_GSC_RESET 0x0000 #define SIOP_GSC_OFFSET 0x0100 @@ -124,7 +124,7 @@ siop_gsc_attach(device_t parent, device_t self, void *aux) siop_attach(sc); - (void)hp700_intr_establish(IPL_BIO, siop_intr, sc, ga->ga_ir, + (void)hppa_intr_establish(IPL_BIO, siop_intr, sc, ga->ga_ir, ga->ga_irq); } diff --git a/sys/arch/hp700/hp700/autoconf.c b/sys/arch/hppa/hppa/autoconf.c index e75df9f4c1d..3aa455b0fe3 100644 --- a/sys/arch/hp700/hp700/autoconf.c +++ b/sys/arch/hppa/hppa/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.51 2013/10/19 13:21:43 skrll Exp $ */ +/* $NetBSD: autoconf.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: autoconf.c,v 1.15 2001/06/25 00:43:10 mickey Exp $ */ @@ -86,7 +86,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.51 2013/10/19 13:21:43 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include "opt_kgdb.h" #include "opt_useleds.h" @@ -118,9 +118,9 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.51 2013/10/19 13:21:43 skrll Exp $"); #include <dev/cons.h> -#include <hp700/hp700/machdep.h> -#include <hp700/dev/cpudevs.h> -#include <hp700/gsc/gscbusvar.h> +#include <hppa/hppa/machdep.h> +#include <hppa/dev/cpudevs.h> +#include <hppa/gsc/gscbusvar.h> static TAILQ_HEAD(hppa_pdcmodule_head, hppa_pdcmodule) hppa_pdcmodule_list = TAILQ_HEAD_INITIALIZER(hppa_pdcmodule_list); @@ -143,9 +143,9 @@ struct hppa_pdcmodule { * LED blinking thing */ #ifdef USELEDS -int _hp700_led_on_cycles[_HP700_LEDS_BLINKABLE]; -static struct callout hp700_led_callout; -static void hp700_led_blinker(void *); +int _hppa_led_on_cycles[_HPPA_LEDS_BLINKABLE]; +static struct callout hppa_led_callout; +static void hppa_led_blinker(void *); extern int hz; #endif @@ -170,8 +170,8 @@ cpu_configure(void) */ if (boothowto & RB_KDB) { #ifdef KGDB - extern int hp700_kgdb_attached; - if (hp700_kgdb_attached) + extern int hppa_kgdb_attached; + if (hppa_kgdb_attached) kgdb_connect(1); #elif defined(DDB) Debugger(); @@ -183,16 +183,16 @@ cpu_configure(void) panic("no mainbus found"); /* Allow interrupts - we're trusting spl* here */ - hp700_intr_enable(); + hppa_intr_enable(); spl0(); if (cold_hook) (*cold_hook)(HPPA_COLD_HOT); #ifdef USELEDS - memset(_hp700_led_on_cycles, 0, sizeof(_hp700_led_on_cycles)); - callout_init(&hp700_led_callout, 0); - hp700_led_blinker((void *) 0); + memset(_hppa_led_on_cycles, 0, sizeof(_hppa_led_on_cycles)); + callout_init(&hppa_led_callout, 0); + hppa_led_blinker((void *) 0); #endif } @@ -201,7 +201,7 @@ cpu_configure(void) * This sets LEDs. */ void -hp700_led_ctl(int off, int on, int toggle) +hppa_led_ctl(int off, int on, int toggle) { int r; @@ -214,17 +214,17 @@ hp700_led_ctl(int off, int on, int toggle) if (machine_ledword) *machine_ledaddr = r; else { -#define HP700_LED_DATA 0x01 -#define HP700_LED_STROBE 0x02 +#define HPPA_LED_DATA 0x01 +#define HPPA_LED_STROBE 0x02 int b; for (b = 0x80; b; b >>= 1) { - *machine_ledaddr = (r & b)? HP700_LED_DATA : 0; + *machine_ledaddr = (r & b)? HPPA_LED_DATA : 0; DELAY(1); - *machine_ledaddr = ((r & b)? HP700_LED_DATA : 0) | - HP700_LED_STROBE; + *machine_ledaddr = ((r & b)? HPPA_LED_DATA : 0) | + HPPA_LED_STROBE; } -#undef HP700_LED_DATA -#undef HP700_LED_STROBE +#undef HPPA_LED_DATA +#undef HPPA_LED_STROBE } } @@ -232,7 +232,7 @@ hp700_led_ctl(int off, int on, int toggle) * This callout handler blinks LEDs. */ static void -hp700_led_blinker(void *arg) +hppa_led_blinker(void *arg) { u_int led_cycle = (u_int) arg; int leds, led_i, led; @@ -245,37 +245,37 @@ hp700_led_blinker(void *arg) * _| |_| |_,_,_,_ * 0 1 2 3 4 6 7 */ -#define HP700_HEARTBEAT_CYCLES (_HP700_LED_FREQ / 8) - if (led_cycle == (0 * HP700_HEARTBEAT_CYCLES) || - led_cycle == (2 * HP700_HEARTBEAT_CYCLES)) { - _hp700_led_on_cycles[HP700_LED_HEARTBEAT] = - HP700_HEARTBEAT_CYCLES; +#define HPPA_HEARTBEAT_CYCLES (_HPPA_LED_FREQ / 8) + if (led_cycle == (0 * HPPA_HEARTBEAT_CYCLES) || + led_cycle == (2 * HPPA_HEARTBEAT_CYCLES)) { + _hppa_led_on_cycles[HPPA_LED_HEARTBEAT] = + HPPA_HEARTBEAT_CYCLES; } /* Form the new LED mask. */ leds = 0; for (led_i = 0, led = (1 << 0); - led_i < _HP700_LEDS_BLINKABLE; + led_i < _HPPA_LEDS_BLINKABLE; led_i++, led <<= 1) { - if (_hp700_led_on_cycles[led_i] > 0) + if (_hppa_led_on_cycles[led_i] > 0) leds |= led; - if (_hp700_led_on_cycles[led_i] >= 0) - _hp700_led_on_cycles[led_i]--; + if (_hppa_led_on_cycles[led_i] >= 0) + _hppa_led_on_cycles[led_i]--; } /* Add in the system load. */ load = averunnable.ldavg[0] >> FSHIFT; - if (load >= (1 << (_HP700_LEDS_COUNT - _HP700_LEDS_BLINKABLE))) - load = (1 << (_HP700_LEDS_COUNT - _HP700_LEDS_BLINKABLE)) - 1; - leds |= (load << _HP700_LEDS_BLINKABLE); + if (load >= (1 << (_HPPA_LEDS_COUNT - _HPPA_LEDS_BLINKABLE))) + load = (1 << (_HPPA_LEDS_COUNT - _HPPA_LEDS_BLINKABLE)) - 1; + leds |= (load << _HPPA_LEDS_BLINKABLE); /* Set the LEDs. */ - hp700_led_ctl(-1, leds, 0); + hppa_led_ctl(-1, leds, 0); - /* NB: this assumes _HP700_LED_FREQ is a power of two. */ - led_cycle = (led_cycle + 1) & (_HP700_LED_FREQ - 1); - callout_reset(&hp700_led_callout, hz / _HP700_LED_FREQ, - hp700_led_blinker, (void *) led_cycle); + /* NB: this assumes _HPPA_LED_FREQ is a power of two. */ + led_cycle = (led_cycle + 1) & (_HPPA_LED_FREQ - 1); + callout_reset(&hppa_led_callout, hz / _HPPA_LED_FREQ, + hppa_led_blinker, (void *) led_cycle); } #endif /* USELEDS */ @@ -333,12 +333,12 @@ device_register(device_t dev, void *aux) if ((pdev = device_parent(dev)) == NULL || device_parent(pdev) == NULL) return; - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); /* * The boot device is described in PAGE0->mem_boot. We need to do it * this way as the MD device path (DP) information in struct confargs - * is only available in hp700 MD devices. So boot_device is used to + * is only available in hppa MD devices. So boot_device is used to * propagate information down the device tree. * * If the boot device is a GSC network device all we need to compare @@ -386,13 +386,13 @@ device_register(device_t dev, void *aux) /* and compare the rest. */ if (PAGE0->mem_boot.pz_dp.dp_bc[i] != ca->ca_dp.dp_bc[n]) { - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); return; } n++; } if (PAGE0->mem_boot.pz_dp.dp_bc[i] != ca->ca_dp.dp_mod) { - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); return; } /* This is the PCI host bridge in front of the boot device. */ @@ -444,7 +444,7 @@ device_register(device_t dev, void *aux) } } - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); return; } @@ -458,7 +458,7 @@ cpu_rootconf(void) int pagezero_cookie; int n; - pagezero_cookie = hp700_pagezero_map(); + pagezero_cookie = hppa_pagezero_map(); printf("PROM boot device: hpa %p path ", PAGE0->mem_boot.pz_hpa); for (n = 0 ; n < 6 ; n++) { if (PAGE0->mem_boot.pz_dp.dp_bc[n] >= 0) @@ -472,7 +472,7 @@ cpu_rootconf(void) printf("dp_flags 0x%x pz_class 0x%x\n", PAGE0->mem_boot.pz_dp.dp_flags, PAGE0->mem_boot.pz_class); - hp700_pagezero_unmap(pagezero_cookie); + hppa_pagezero_unmap(pagezero_cookie); #endif /* DEBUG */ if (boot_device != NULL) @@ -574,8 +574,8 @@ pdc_scanbus(device_t self, struct confargs *ca, nca.ca_hpasz = hm->hm_hpasz; if (hm->hm_naddrs) { - if (hm->hm_naddrs > HP700_MAXIOADDRS) { - nca.ca_naddrs = HP700_MAXIOADDRS; + if (hm->hm_naddrs > HPPA_MAXIOADDRS) { + nca.ca_naddrs = HPPA_MAXIOADDRS; aprint_error("WARNING: too many (%d) addrs\n", hm->hm_naddrs); } else @@ -623,7 +623,7 @@ pdc_scanbus(device_t self, struct confargs *ca, aprint_debug(" type %x sv %x\n", nca.ca_type.iodc_type, nca.ca_type.iodc_sv_model); - nca.ca_irq = HP700CF_IRQ_UNDEF; + nca.ca_irq = HPPACF_IRQ_UNDEF; nca.ca_name = hppa_mod_info(nca.ca_type.iodc_type, nca.ca_type.iodc_sv_model); @@ -636,7 +636,7 @@ pdc_scanbus(device_t self, struct confargs *ca, } static const struct hppa_mod_info hppa_knownmods[] = { -#include <hp700/dev/cpudevs_data.h> +#include <hppa/dev/cpudevs_data.h> }; const char * diff --git a/sys/arch/hp700/hp700/conf.c b/sys/arch/hppa/hppa/conf.c index ae945ef5864..87409cb691e 100644 --- a/sys/arch/hp700/hp700/conf.c +++ b/sys/arch/hppa/hppa/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.10 2012/02/05 08:27:37 skrll Exp $ */ +/* $NetBSD: conf.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: conf.c,v 1.15 2001/09/28 02:53:13 mickey Exp $ */ @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.10 2012/02/05 08:27:37 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include <sys/param.h> #include <sys/conf.h> diff --git a/sys/arch/hp700/hp700/disksubr.c b/sys/arch/hppa/hppa/disksubr.c index 5024dbbe03d..a7ec7221347 100644 --- a/sys/arch/hp700/hp700/disksubr.c +++ b/sys/arch/hppa/hppa/disksubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.28 2013/10/19 14:00:59 skrll Exp $ */ +/* $NetBSD: disksubr.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: disksubr.c,v 1.6 2000/10/18 21:00:34 mickey Exp $ */ @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.28 2013/10/19 14:00:59 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -208,11 +208,11 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), struct disklabel *lp, int fsoff; /* read LIF volume header */ - bp->b_blkno = btodb(HP700_LIF_VOLSTART); + bp->b_blkno = btodb(HPPA_LIF_VOLSTART); bp->b_bcount = lp->d_secsize; bp->b_cflags = BC_BUSY; bp->b_flags = B_READ; - bp->b_cylinder = btodb(HP700_LIF_VOLSTART) / lp->d_secpercyl; + bp->b_cylinder = btodb(HPPA_LIF_VOLSTART) / lp->d_secpercyl; (*strat)(bp); if (biowait(bp)) { @@ -221,22 +221,22 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), struct disklabel *lp, return "LIF volume header I/O error"; } - memcpy(&osdep->lifvol, bp->b_data, sizeof(struct hp700_lifvol)); - if (osdep->lifvol.vol_id != HP700_LIF_VOL_ID) { + memcpy(&osdep->lifvol, bp->b_data, sizeof(struct hppa_lifvol)); + if (osdep->lifvol.vol_id != HPPA_LIF_VOL_ID) { fsoff = 0; } else { struct buf *dbp; - struct hp700_lifdir *p; + struct hppa_lifdir *p; - dbp = geteblk(HP700_LIF_DIRSIZE); + dbp = geteblk(HPPA_LIF_DIRSIZE); dbp->b_dev = bp->b_dev; /* read LIF directory */ - dbp->b_blkno = btodb(HP700_LIF_DIRSTART); + dbp->b_blkno = btodb(HPPA_LIF_DIRSTART); dbp->b_bcount = lp->d_secsize; dbp->b_cflags = BC_BUSY; dbp->b_flags = B_READ; - dbp->b_cylinder = (HP700_LIF_DIRSTART) / lp->d_secpercyl; + dbp->b_cylinder = (HPPA_LIF_DIRSTART) / lp->d_secpercyl; (*strat)(dbp); @@ -248,13 +248,13 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), struct disklabel *lp, return "LIF directory I/O error"; } - memcpy(osdep->lifdir, dbp->b_data, HP700_LIF_DIRSIZE); + memcpy(osdep->lifdir, dbp->b_data, HPPA_LIF_DIRSIZE); brelse(dbp, BC_INVAL); /* scan for LIF_DIR_FS dir entry */ for (fsoff = -1, p = &osdep->lifdir[0]; - fsoff < 0 && p < &osdep->lifdir[HP700_LIF_NUMDIR]; p++) - if (p->dir_type == HP700_LIF_DIR_FS) - fsoff = hp700_lifstodb(p->dir_addr); + fsoff < 0 && p < &osdep->lifdir[HPPA_LIF_NUMDIR]; p++) + if (p->dir_type == HPPA_LIF_DIR_FS) + fsoff = hppa_lifstodb(p->dir_addr); /* if no suitable lifdir entry found assume 0 */ if (fsoff < 0) diff --git a/sys/arch/hp700/hp700/genassym.cf b/sys/arch/hppa/hppa/genassym.cf index 883a4b883f9..884caf12679 100644 --- a/sys/arch/hp700/hp700/genassym.cf +++ b/sys/arch/hppa/hppa/genassym.cf @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.34 2012/05/23 16:11:37 skrll Exp $ +# $NetBSD: genassym.cf,v 1.1 2014/02/24 07:23:43 skrll Exp $ # $OpenBSD: genassym.cf,v 1.18 2001/09/20 18:31:14 mickey Exp $ @@ -83,8 +83,8 @@ export HPPA_BREAK_KERNEL export HPPA_BREAK_GET_PSW export HPPA_BREAK_SET_PSW -# hp700_int_reg fields -struct hp700_interrupt_register +# hppa_interrupt_register fields +struct hppa_interrupt_register member IR_REQ ir_req member IR_BITS_MAP ir_bits_map diff --git a/sys/arch/hppa/hppa/hppa_machdep.c b/sys/arch/hppa/hppa/hppa_machdep.c index 3da9bd0b956..9c29a76b3fa 100644 --- a/sys/arch/hppa/hppa/hppa_machdep.c +++ b/sys/arch/hppa/hppa/hppa_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: hppa_machdep.c,v 1.28 2012/05/21 14:15:17 martin Exp $ */ +/* $NetBSD: hppa_machdep.c,v 1.29 2014/02/24 07:23:43 skrll Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hppa_machdep.c,v 1.28 2012/05/21 14:15:17 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hppa_machdep.c,v 1.29 2014/02/24 07:23:43 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -50,7 +50,7 @@ char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */ /* * XXX fredette - much of the TLB trap handler setup should - * probably be moved here from hp700/hp700/machdep.c, seeing + * probably be moved here from hppa/hppa/machdep.c, seeing * that there's related code already in hppa/hppa/trap.S. */ diff --git a/sys/arch/hp700/hp700/intr.c b/sys/arch/hppa/hppa/intr.c index cf77b14be98..9b2b4b7a3e9 100644 --- a/sys/arch/hp700/hp700/intr.c +++ b/sys/arch/hppa/hppa/intr.c @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.42 2013/10/19 13:13:09 skrll Exp $ */ +/* $NetBSD: intr.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: intr.c,v 1.27 2009/12/31 12:52:35 jsing Exp $ */ /* @@ -31,11 +31,11 @@ */ /* - * Interrupt handling for NetBSD/hp700. + * Interrupt handling for NetBSD/hppa. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.42 2013/10/19 13:13:09 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #define __MUTEX_PRIVATE @@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.42 2013/10/19 13:13:09 skrll Exp $"); #include <machine/intr.h> #include <machine/reg.h> -#include <hp700/hp700/machdep.h> +#include <hppa/hppa/machdep.h> #include <machine/mutex.h> @@ -58,21 +58,21 @@ __KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.42 2013/10/19 13:13:09 skrll Exp $"); #include "opt_lockdebug.h" #endif -static int hp700_intr_ipl_next(struct cpu_info *); -void hp700_intr_calculatemasks(struct cpu_info *); -int hp700_intr_ipending(struct hp700_interrupt_register *, int); -void hp700_intr_dispatch(int , int , struct trapframe *); +static int hppa_intr_ipl_next(struct cpu_info *); +void hppa_intr_calculatemasks(struct cpu_info *); +int hppa_intr_ipending(struct hppa_interrupt_register *, int); +void hppa_intr_dispatch(int , int , struct trapframe *); /* The list of all interrupt registers. */ -struct hp700_interrupt_register *hp700_interrupt_registers[HP700_INTERRUPT_BITS]; +struct hppa_interrupt_register *hppa_interrupt_registers[HPPA_INTERRUPT_BITS]; /* * This establishes a new interrupt register. */ void -hp700_interrupt_register_establish(struct cpu_info *ci, - struct hp700_interrupt_register *ir) +hppa_interrupt_register_establish(struct cpu_info *ci, + struct hppa_interrupt_register *ir) { int idx; @@ -80,24 +80,24 @@ hp700_interrupt_register_establish(struct cpu_info *ci, memset(ir, 0, sizeof(*ir)); ir->ir_ci = ci; - for (idx = 0; idx < HP700_INTERRUPT_BITS; idx++) + for (idx = 0; idx < HPPA_INTERRUPT_BITS; idx++) ir->ir_bits_map[idx] = IR_BIT_UNUSED; ir->ir_bits = ~0; /* Add this structure to the list. */ - for (idx = 0; idx < HP700_INTERRUPT_BITS; idx++) - if (hp700_interrupt_registers[idx] == NULL) + for (idx = 0; idx < HPPA_INTERRUPT_BITS; idx++) + if (hppa_interrupt_registers[idx] == NULL) break; - if (idx == HP700_INTERRUPT_BITS) + if (idx == HPPA_INTERRUPT_BITS) panic("%s: too many regs", __func__); - hp700_interrupt_registers[idx] = ir; + hppa_interrupt_registers[idx] = ir; } /* * This initialise interrupts for a CPU. */ void -hp700_intr_initialise(struct cpu_info *ci) +hppa_intr_initialise(struct cpu_info *ci) { int i; @@ -118,22 +118,22 @@ hp700_intr_initialise(struct cpu_info *ci) memset(ci->ci_ib, 0, sizeof(ci->ci_ib)); /* There are no interrupt registers. */ - memset(hp700_interrupt_registers, 0, sizeof(hp700_interrupt_registers)); + memset(hppa_interrupt_registers, 0, sizeof(hppa_interrupt_registers)); } /* * This establishes a new interrupt handler. */ void * -hp700_intr_establish(int ipl, int (*handler)(void *), void *arg, - struct hp700_interrupt_register *ir, int bit_pos) +hppa_intr_establish(int ipl, int (*handler)(void *), void *arg, + struct hppa_interrupt_register *ir, int bit_pos) { - struct hp700_interrupt_bit *ib; + struct hppa_interrupt_bit *ib; struct cpu_info *ci = ir->ir_ci; int idx; /* Panic on a bad interrupt bit. */ - if (bit_pos < 0 || bit_pos >= HP700_INTERRUPT_BITS) + if (bit_pos < 0 || bit_pos >= HPPA_INTERRUPT_BITS) panic("%s: bad interrupt bit %d", __func__, bit_pos); /* @@ -151,10 +151,10 @@ hp700_intr_establish(int ipl, int (*handler)(void *), void *arg, * simply note that in the mapping for the bit. */ if (handler == NULL) { - for (idx = 1; idx < HP700_INTERRUPT_BITS; idx++) - if (hp700_interrupt_registers[idx] == arg) + for (idx = 1; idx < HPPA_INTERRUPT_BITS; idx++) + if (hppa_interrupt_registers[idx] == arg) break; - if (idx == HP700_INTERRUPT_BITS) + if (idx == HPPA_INTERRUPT_BITS) panic("%s: unknown int reg", __func__); ir->ir_bits_map[31 ^ bit_pos] = IR_BIT_REG(idx); @@ -165,7 +165,7 @@ hp700_intr_establish(int ipl, int (*handler)(void *), void *arg, /* * Otherwise, allocate a new bit in the spl. */ - idx = hp700_intr_ipl_next(ir->ir_ci); + idx = hppa_intr_ipl_next(ir->ir_ci); ir->ir_bits &= ~(1 << bit_pos); ir->ir_rbits &= ~(1 << bit_pos); @@ -175,7 +175,7 @@ hp700_intr_establish(int ipl, int (*handler)(void *), void *arg, int j; ir->ir_bits_map[31 ^ bit_pos] |= 1 << idx; - j = (ir - hp700_interrupt_registers[0]); + j = (ir - hppa_interrupt_registers[0]); ci->ci_ishared |= (1 << j); } ib = &ci->ci_ib[idx]; @@ -191,7 +191,7 @@ hp700_intr_establish(int ipl, int (*handler)(void *), void *arg, ib->ib_handler = handler; ib->ib_arg = arg; - hp700_intr_calculatemasks(ci); + hppa_intr_calculatemasks(ci); return ib; } @@ -201,7 +201,7 @@ hp700_intr_establish(int ipl, int (*handler)(void *), void *arg, * It returns the bit position, or -1 if no bits were available. */ int -hp700_intr_allocate_bit(struct hp700_interrupt_register *ir, int irq) +hppa_intr_allocate_bit(struct hppa_interrupt_register *ir, int irq) { int bit_pos; int last_bit; @@ -234,14 +234,14 @@ hp700_intr_allocate_bit(struct hp700_interrupt_register *ir, int irq) * This returns the next available spl bit. */ static int -hp700_intr_ipl_next(struct cpu_info *ci) +hppa_intr_ipl_next(struct cpu_info *ci) { int idx; - for (idx = 0; idx < HP700_INTERRUPT_BITS; idx++) + for (idx = 0; idx < HPPA_INTERRUPT_BITS; idx++) if (ci->ci_ib[idx].ib_reg == NULL) break; - if (idx == HP700_INTERRUPT_BITS) + if (idx == HPPA_INTERRUPT_BITS) panic("%s: too many devices", __func__); return idx; } @@ -250,10 +250,10 @@ hp700_intr_ipl_next(struct cpu_info *ci) * This finally initializes interrupts. */ void -hp700_intr_calculatemasks(struct cpu_info *ci) +hppa_intr_calculatemasks(struct cpu_info *ci) { - struct hp700_interrupt_bit *ib; - struct hp700_interrupt_register *ir; + struct hppa_interrupt_bit *ib; + struct hppa_interrupt_register *ir; int idx, bit_pos; int mask; int ipl; @@ -262,7 +262,7 @@ hp700_intr_calculatemasks(struct cpu_info *ci) * Put together the initial imask for each level. */ memset(ci->ci_imask, 0, sizeof(ci->ci_imask)); - for (bit_pos = 0; bit_pos < HP700_INTERRUPT_BITS; bit_pos++) { + for (bit_pos = 0; bit_pos < HPPA_INTERRUPT_BITS; bit_pos++) { ib = &ci->ci_ib[bit_pos]; if (ib->ib_reg == NULL) continue; @@ -291,12 +291,12 @@ hp700_intr_calculatemasks(struct cpu_info *ci) KASSERT(ci->ci_cpl == -1); KASSERT(ci->ci_ipending == 0); - for (idx = 0; idx < HP700_INTERRUPT_BITS; idx++) { - ir = hp700_interrupt_registers[idx]; + for (idx = 0; idx < HPPA_INTERRUPT_BITS; idx++) { + ir = hppa_interrupt_registers[idx]; if (ir == NULL || ir->ir_ci != ci) continue; mask = 0; - for (bit_pos = 0; bit_pos < HP700_INTERRUPT_BITS; bit_pos++) { + for (bit_pos = 0; bit_pos < HPPA_INTERRUPT_BITS; bit_pos++) { if (IR_BIT_USED_P(ir->ir_bits_map[31 ^ bit_pos])) mask |= (1 << bit_pos); } @@ -308,7 +308,7 @@ hp700_intr_calculatemasks(struct cpu_info *ci) } void -hp700_intr_enable(void) +hppa_intr_enable(void) { struct cpu_info *ci = curcpu(); @@ -320,7 +320,7 @@ hp700_intr_enable(void) /* * Service interrupts. This doesn't necessarily dispatch them. This is called - * with %eiem loaded with zero. It's named hppa_intr instead of hp700_intr + * with %eiem loaded with zero. It's named hppa_intr instead of hppa_intr * because trap.c calls it. */ void @@ -367,25 +367,25 @@ hppa_intr(struct trapframe *frame) mfctl(CR_EIRR, eirr); mtctl(eirr, CR_EIRR); - ci->ci_ipending |= hp700_intr_ipending(&ci->ci_ir, eirr); + ci->ci_ipending |= hppa_intr_ipending(&ci->ci_ir, eirr); i = 0; /* If we have interrupts to dispatch, do so. */ while (ci->ci_ipending & ~ci->ci_cpl) { int shared; - hp700_intr_dispatch(ci->ci_cpl, frame->tf_eiem, frame); + hppa_intr_dispatch(ci->ci_cpl, frame->tf_eiem, frame); shared = ci->ci_ishared; while (shared) { - struct hp700_interrupt_register *sir; + struct hppa_interrupt_register *sir; int sbit, lvl; sbit = ffs(shared) - 1; - sir = hp700_interrupt_registers[sbit]; + sir = hppa_interrupt_registers[sbit]; lvl = *sir->ir_level; - ci->ci_ipending |= hp700_intr_ipending(sir, lvl); + ci->ci_ipending |= hppa_intr_ipending(sir, lvl); shared &= ~(1 << sbit); } i++; @@ -400,10 +400,10 @@ hppa_intr(struct trapframe *frame) * This is called with %eiem loaded with zero. */ void -hp700_intr_dispatch(int ncpl, int eiem, struct trapframe *frame) +hppa_intr_dispatch(int ncpl, int eiem, struct trapframe *frame) { struct cpu_info *ci = curcpu(); - struct hp700_interrupt_bit *ib; + struct hppa_interrupt_bit *ib; struct clockframe clkframe; int ipending_run; int bit_pos; @@ -483,7 +483,7 @@ hp700_intr_dispatch(int ncpl, int eiem, struct trapframe *frame) int -hp700_intr_ipending(struct hp700_interrupt_register *ir, int eirr) +hppa_intr_ipending(struct hppa_interrupt_register *ir, int eirr) { int pending = 0; int idx; @@ -492,11 +492,11 @@ hp700_intr_ipending(struct hp700_interrupt_register *ir, int eirr) if ((eirr & (1 << idx)) == 0) continue; if (IR_BIT_NESTED_P(ir->ir_bits_map[31 ^ idx])) { - struct hp700_interrupt_register *nir; + struct hppa_interrupt_register *nir; int reg = ir->ir_bits_map[31 ^ idx] & ~IR_BIT_MASK; - nir = hp700_interrupt_registers[reg]; - pending |= hp700_intr_ipending(nir, *(nir->ir_req)); + nir = hppa_interrupt_registers[reg]; + pending |= hppa_intr_ipending(nir, *(nir->ir_req)); } else { pending |= ir->ir_bits_map[31 ^ idx]; } diff --git a/sys/arch/hp700/hp700/locore.S b/sys/arch/hppa/hppa/locore.S index 30feaeb1bc6..be46c99b4b8 100644 --- a/sys/arch/hp700/hp700/locore.S +++ b/sys/arch/hppa/hppa/locore.S @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.61 2012/05/23 16:11:37 skrll Exp $ */ +/* $NetBSD: locore.S,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $ */ /* @@ -135,7 +135,7 @@ .import lwp0, data .import panic, code .import fpu_csw, data - .import hp700_interrupt_registers, data + .import hppa_interrupt_register, data BSS(pdc_stack, 4) /* temp stack for PDC call */ BSS(kernelmapped, 4) /* set when kernel is mapped */ @@ -700,9 +700,9 @@ spllower_dispatch: stw %arg0, HPPA_FRAME_ARG(0)(%r3) stw %arg1, HPPA_FRAME_ARG(1)(%r3) - /* call hp700_intr_dispatch */ - ldil L%hp700_intr_dispatch, %r1 - ldo R%hp700_intr_dispatch(%r1), %r1 + /* call hppa_intr_dispatch */ + ldil L%hppa_intr_dispatch, %r1 + ldo R%hppa_intr_dispatch(%r1), %r1 blr %r0, %rp .call bv %r0(%r1) @@ -719,7 +719,7 @@ spllower_dispatch: spllower_out: /* * Now return, storing %eiem in the delay slot. - * (hp700_intr_dispatch leaves it zero). I think + * (hppa_intr_dispatch leaves it zero). I think * doing this in the delay slot is important to * prevent recursion, but I might be being too * paranoid. @@ -729,9 +729,9 @@ spllower_out: EXIT(spllower) /* - * void hp700_intr_schedule(int mask); + * void hppa_intr_schedule(int mask); */ -ENTRY(hp700_intr_schedule,0) +ENTRY(hppa_intr_schedule,0) GET_CURCPU(%t2) mfctl %eiem, %arg1 mtctl %r0, %eiem ; disable interrupts @@ -743,7 +743,7 @@ ENTRY(hp700_intr_schedule,0) b,n spllower_dispatch ; dispatch if we can bv %r0(%rp) mtctl %arg1, %eiem -EXIT(hp700_intr_schedule) +EXIT(hppa_intr_schedule) /* * void cpu_die(void); diff --git a/sys/arch/hp700/hp700/machdep.c b/sys/arch/hppa/hppa/machdep.c index a3b8ffa3f5f..fcd4d357f71 100644 --- a/sys/arch/hp700/hp700/machdep.c +++ b/sys/arch/hppa/hppa/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.119 2014/02/15 07:38:22 skrll Exp $ */ +/* $NetBSD: machdep.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.119 2014/02/15 07:38:22 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include "opt_cputype.h" #include "opt_ddb.h" @@ -121,9 +121,9 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.119 2014/02/15 07:38:22 skrll Exp $"); #include <ddb/db_extern.h> #endif -#include <hp700/hp700/machdep.h> -#include <hp700/hp700/pim.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/hppa/machdep.h> +#include <hppa/hppa/pim.h> +#include <hppa/dev/cpudevs.h> #ifdef PMAPDEBUG #include <hppa/hppa/hpt.h> @@ -267,8 +267,8 @@ u_int hppa_btlb_size_min, hppa_btlb_size_max; /* * Things for MI glue to stick on. */ -struct extent *hp700_io_extent; -static long hp700_io_extent_store[EXTENT_FIXED_STORAGE_SIZE(64) / sizeof(long)]; +struct extent *hppa_io_extent; +static long hppa_io_extent_store[EXTENT_FIXED_STORAGE_SIZE(64) / sizeof(long)]; struct pool hppa_fppl; struct fpreg lwp0_fpregs; @@ -306,7 +306,7 @@ struct pdc_model pdc_model; /* * Debugger info. */ -int hp700_kgdb_attached; +int hppa_kgdb_attached; /* * Whatever CPU types we support @@ -524,9 +524,9 @@ hppa_init(paddr_t start, void *bi) resvmem = atop(resvmem); /* XXXNH */ /* we hope this won't fail */ - hp700_io_extent = extent_create("io", + hppa_io_extent = extent_create("io", HPPA_IOSPACE, 0xffffffff, - (void *)hp700_io_extent_store, sizeof(hp700_io_extent_store), + (void *)hppa_io_extent_store, sizeof(hppa_io_extent_store), EX_NOCOALESCE|EX_NOWAIT); vstart = round_page(start); @@ -586,7 +586,7 @@ do { \ DPRINTF(("%s: intr bootstrap\n", __func__)); /* Bootstrap interrupt masking and dispatching. */ - hp700_intr_initialise(ci); + hppa_intr_initialise(ci); /* * Initialize any debugger. @@ -599,12 +599,12 @@ do { \ * works because, currently, the mainbus.c bus_space * implementation directly-maps things in I/O space. */ - hp700_kgdb_attached = false; + hppa_kgdb_attached = false; #if NCOM > 0 if (!strcmp(KGDB_DEVNAME, "com")) { int com_gsc_kgdb_attach(void); if (com_gsc_kgdb_attach() == 0) - hp700_kgdb_attached = true; + hppa_kgdb_attached = true; } #endif /* NCOM > 0 */ #endif /* KGDB */ @@ -1084,9 +1084,9 @@ ibtlb_g(int i, pa_space_t sp, vaddr_t va, paddr_t pa, vsize_t sz, u_int prot) /* * This inserts a recorded BTLB slot. */ -static int _hp700_btlb_insert(struct btlb_slot *); +static int _hppa_btlb_insert(struct btlb_slot *); static int -_hp700_btlb_insert(struct btlb_slot *btlb_slot) +_hppa_btlb_insert(struct btlb_slot *btlb_slot) { int error; #ifdef MACHDEPDEBUG @@ -1274,7 +1274,7 @@ hppa_btlb_insert(pa_space_t space, vaddr_t va, paddr_t pa, vsize_t *sizep, btlb_slot->btlb_slot_pa_frame = pa; btlb_slot->btlb_slot_tlbprot = tlbprot; btlb_slot->btlb_slot_frames = slot_mapped_frames; - error = _hp700_btlb_insert(btlb_slot); + error = _hppa_btlb_insert(btlb_slot); if (error) return -error; /* @@ -1306,7 +1306,7 @@ hppa_btlb_reload(void) error = 0; while (error == 0 && btlb_slot < btlb_slot_end) { if (btlb_slot->btlb_slot_frames != 0) - error = _hp700_btlb_insert(btlb_slot); + error = _hppa_btlb_insert(btlb_slot); btlb_slot++; } DPRINTF(("\n")); @@ -1359,10 +1359,10 @@ hppa_btlb_purge(pa_space_t space, vaddr_t va, vsize_t *sizep) /* * This maps page zero if it isn't already mapped, and - * returns a cookie for hp700_pagezero_unmap. + * returns a cookie for hppa_pagezero_unmap. */ int -hp700_pagezero_map(void) +hppa_pagezero_map(void) { int was_mapped_before; int s; @@ -1379,10 +1379,10 @@ hp700_pagezero_map(void) /* * This unmaps mape zero, given a cookie previously returned - * by hp700_pagezero_map. + * by hppa_pagezero_map. */ void -hp700_pagezero_unmap(int was_mapped_before) +hppa_pagezero_unmap(int was_mapped_before) { int s; @@ -1497,11 +1497,11 @@ do { \ static inline void hppa_pim_dump(int check_type, void *data, size_t size) { - struct hp700_pim_hpmc *hpmc; - struct hp700_pim_lpmc *lpmc; - struct hp700_pim_toc *toc; - struct hp700_pim_regs *regs; - struct hp700_pim_checks *checks; + struct hppa_pim_hpmc *hpmc; + struct hppa_pim_lpmc *lpmc; + struct hppa_pim_toc *toc; + struct hppa_pim_regs *regs; + struct hppa_pim_checks *checks; u_int *regarray; int reg_i, reg_j, reg_k; char bitmask_buffer[64]; @@ -1511,16 +1511,16 @@ hppa_pim_dump(int check_type, void *data, size_t size) checks = NULL; switch (check_type) { case T_HPMC: - hpmc = (struct hp700_pim_hpmc *) data; + hpmc = (struct hppa_pim_hpmc *) data; regs = &hpmc->pim_hpmc_regs; checks = &hpmc->pim_hpmc_checks; break; case T_LPMC: - lpmc = (struct hp700_pim_lpmc *) data; + lpmc = (struct hppa_pim_lpmc *) data; checks = &lpmc->pim_lpmc_checks; break; case T_INTERRUPT: - toc = (struct hp700_pim_toc *) data; + toc = (struct hppa_pim_toc *) data; regs = &toc->pim_toc_regs; break; default: @@ -1589,11 +1589,11 @@ hppa_pim_dump(int check_type, void *data, size_t size) static inline void hppa_pim64_dump(int check_type, void *data, size_t size) { - struct hp700_pim64_hpmc *hpmc; - struct hp700_pim64_lpmc *lpmc; - struct hp700_pim64_toc *toc; - struct hp700_pim64_regs *regs; - struct hp700_pim64_checks *checks; + struct hppa_pim64_hpmc *hpmc; + struct hppa_pim64_lpmc *lpmc; + struct hppa_pim64_toc *toc; + struct hppa_pim64_regs *regs; + struct hppa_pim64_checks *checks; int reg_i, reg_j, reg_k; uint64_t *regarray; char bitmask_buffer[64]; @@ -1603,16 +1603,16 @@ hppa_pim64_dump(int check_type, void *data, size_t size) checks = NULL; switch (check_type) { case T_HPMC: - hpmc = (struct hp700_pim64_hpmc *) data; + hpmc = (struct hppa_pim64_hpmc *) data; regs = &hpmc->pim_hpmc_regs; checks = &hpmc->pim_hpmc_checks; break; case T_LPMC: - lpmc = (struct hp700_pim64_lpmc *) data; + lpmc = (struct hppa_pim64_lpmc *) data; checks = &lpmc->pim_lpmc_checks; break; case T_INTERRUPT: - toc = (struct hp700_pim64_toc *) data; + toc = (struct hppa_pim64_toc *) data; regs = &toc->pim_toc_regs; break; default: diff --git a/sys/arch/hppa/hppa/machdep.h b/sys/arch/hppa/hppa/machdep.h index cb6e57f49bc..d287a235e01 100644 --- a/sys/arch/hppa/hppa/machdep.h +++ b/sys/arch/hppa/hppa/machdep.h @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.h,v 1.15 2011/01/23 21:53:40 skrll Exp $ */ +/* $NetBSD: machdep.h,v 1.16 2014/02/24 07:23:43 skrll Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -38,12 +38,16 @@ /* * XXX there is a lot of stuff in various headers under - * hp700/include and hppa/include, and a lot of one-off - * `extern's in C files that could probably be moved here. + * hppa/include, and a lot of one-off `extern's in C files + * that could probably be moved here. */ #ifdef _KERNEL +#ifdef _KERNEL_OPT +#include "opt_useleds.h" +#endif + /* The primary (aka monarch) CPU HPA */ extern hppa_hpa_t hppa_mcpuhpa; @@ -100,4 +104,41 @@ int hppa_btlb_insert(pa_space_t, vaddr_t, paddr_t, vsize_t *, u_int); int hppa_btlb_reload(void); int hppa_btlb_purge(pa_space_t, vaddr_t, vsize_t *); +/* The LEDs. */ +#define HPPA_LED_NETSND (0) +#define HPPA_LED_NETRCV (1) +#define HPPA_LED_DISK (2) +#define HPPA_LED_HEARTBEAT (3) +#define _HPPA_LEDS_BLINKABLE (4) +#define _HPPA_LEDS_COUNT (8) + +/* This forcefully reboots the machine. */ +void cpu_die(void); + +/* These map and unmap page zero. */ +int hppa_pagezero_map(void); +void hppa_pagezero_unmap(int); + +/* Blinking the LEDs. */ +#ifdef USELEDS +#define _HPPA_LED_FREQ (16) +extern volatile uint8_t *machine_ledaddr; +extern int machine_ledword, machine_leds; +extern int _hppa_led_on_cycles[]; +#define hppa_led_blink(i) \ +do { \ + if (_hppa_led_on_cycles[i] == -1) \ + _hppa_led_on_cycles[i] = 1; \ +} while (/* CONSTCOND */ 0) +#define hppa_led_on(i, ms) \ +do { \ + _hppa_led_on_cycles[i] = (((ms) * _HPPA_LED_FREQ) / 1000); \ +} while (/* CONSTCOND */ 0) +void hppa_led_ctl(int, int, int); +#else /* !USELEDS */ +#define hppa_led_blink(i) +#define hppa_led_on(i, ms) +#define hppa_led_ctl(off, on, toggle) +#endif /* !USELEDS */ + #endif /* _KERNEL */ diff --git a/sys/arch/hp700/hp700/mainbus.c b/sys/arch/hppa/hppa/mainbus.c index bd977e135e6..b0cd7798b2a 100644 --- a/sys/arch/hp700/hp700/mainbus.c +++ b/sys/arch/hppa/hppa/mainbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.85 2013/10/25 09:46:10 martin Exp $ */ +/* $NetBSD: mainbus.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.85 2013/10/25 09:46:10 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include "locators.h" #include "power.h" @@ -79,8 +79,8 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.85 2013/10/25 09:46:10 martin Exp $"); #include <machine/iomod.h> #include <machine/autoconf.h> -#include <hp700/hp700/machdep.h> -#include <hp700/dev/cpudevs.h> +#include <hppa/hppa/machdep.h> +#include <hppa/dev/cpudevs.h> #if NLCD > 0 static struct pdc_chassis_info pdc_chassis_info; @@ -113,7 +113,7 @@ extern struct cfdriver mainbus_cd; static int mb_attached; /* from machdep.c */ -extern struct extent *hp700_io_extent; +extern struct extent *hppa_io_extent; uint8_t mbus_r1(void *, bus_space_handle_t, bus_size_t); uint16_t mbus_r2(void *, bus_space_handle_t, bus_size_t); @@ -247,7 +247,7 @@ mbus_map(void *v, bus_addr_t bpa, bus_size_t size, int flags, /* * Allocate the region of I/O space. */ - error = extent_alloc_region(hp700_io_extent, bpa, size, EX_NOWAIT); + error = extent_alloc_region(hppa_io_extent, bpa, size, EX_NOWAIT); if (error) return (error); @@ -258,7 +258,7 @@ mbus_map(void *v, bus_addr_t bpa, bus_size_t size, int flags, if (error) { DPRINTF(("bus_space_map: pa 0x%lx, size 0x%lx failed\n", bpa, size)); - if (extent_free(hp700_io_extent, bpa, size, EX_NOWAIT)) { + if (extent_free(hppa_io_extent, bpa, size, EX_NOWAIT)) { printf ("bus_space_map: can't free region\n"); } } @@ -275,7 +275,7 @@ mbus_unmap(void *v, bus_space_handle_t bsh, bus_size_t size) /* * Free the region of I/O space. */ - error = extent_free(hp700_io_extent, bpa, size, EX_NOWAIT); + error = extent_free(hppa_io_extent, bpa, size, EX_NOWAIT); if (error) { DPRINTF(("bus_space_unmap: ps 0x%lx, size 0x%lx\n", bpa, size)); @@ -291,14 +291,14 @@ mbus_alloc(void *v, bus_addr_t rstart, bus_addr_t rend, bus_size_t size, bus_addr_t bpa; int error; - if (rstart < hp700_io_extent->ex_start || - rend > hp700_io_extent->ex_end) + if (rstart < hppa_io_extent->ex_start || + rend > hppa_io_extent->ex_end) panic("bus_space_alloc: bad region start/end"); /* * Allocate the region of I/O space. */ - error = extent_alloc_subregion1(hp700_io_extent, rstart, rend, size, + error = extent_alloc_subregion1(hppa_io_extent, rstart, rend, size, align, 0, boundary, EX_NOWAIT, &bpa); if (error) return (error); @@ -310,7 +310,7 @@ mbus_alloc(void *v, bus_addr_t rstart, bus_addr_t rend, bus_size_t size, if (error) { DPRINTF(("bus_space_alloc: pa 0x%lx, size 0x%lx failed\n", bpa, size)); - if (extent_free(hp700_io_extent, bpa, size, EX_NOWAIT)) { + if (extent_free(hppa_io_extent, bpa, size, EX_NOWAIT)) { printf("bus_space_alloc: can't free region\n"); } } @@ -1398,7 +1398,7 @@ mbattach(device_t parent, device_t self, void *aux) /* get some power */ memset(&nca, 0, sizeof(nca)); nca.ca_name = "power"; - nca.ca_irq = HP700CF_IRQ_UNDEF; + nca.ca_irq = HPPACF_IRQ_UNDEF; nca.ca_iot = &hppa_bustag; config_found(self, &nca, mbprint); #endif @@ -1411,7 +1411,7 @@ mbattach(device_t parent, device_t self, void *aux) nca.ca_dp.dp_bc[0] = nca.ca_dp.dp_bc[1] = nca.ca_dp.dp_bc[2] = nca.ca_dp.dp_bc[3] = nca.ca_dp.dp_bc[4] = nca.ca_dp.dp_bc[5] = -1; nca.ca_dp.dp_mod = -1; - nca.ca_irq = HP700CF_IRQ_UNDEF; + nca.ca_irq = HPPACF_IRQ_UNDEF; nca.ca_iot = &hppa_bustag; nca.ca_hpa = nca.ca_pcl.cmd_addr; @@ -1427,7 +1427,7 @@ mbattach(device_t parent, device_t self, void *aux) nca.ca_hpa = 0; nca.ca_hpabase = HPPA_FPA; /* Central bus */ nca.ca_nmodules = MAXMODBUS; - nca.ca_irq = HP700CF_IRQ_UNDEF; + nca.ca_irq = HPPACF_IRQ_UNDEF; nca.ca_iot = &hppa_bustag; nca.ca_dmatag = &hppa_dmatag; nca.ca_dp.dp_bc[0] = nca.ca_dp.dp_bc[1] = nca.ca_dp.dp_bc[2] = @@ -1441,7 +1441,7 @@ mbattach(device_t parent, device_t self, void *aux) nca.ca_hpa = 0; nca.ca_hpabase = 0; /* Central bus already walked above */ nca.ca_nmodules = MAXMODBUS; - nca.ca_irq = HP700CF_IRQ_UNDEF; + nca.ca_irq = HPPACF_IRQ_UNDEF; nca.ca_iot = &hppa_bustag; nca.ca_dmatag = &hppa_dmatag; nca.ca_dp.dp_bc[0] = nca.ca_dp.dp_bc[1] = nca.ca_dp.dp_bc[2] = @@ -1487,8 +1487,8 @@ mbsubmatch(device_t parent, cfdata_t cf, const int *ldesc, void *aux) int saved_irq; saved_irq = ca->ca_irq; - if (cf->hp700cf_irq != HP700CF_IRQ_UNDEF) - ca->ca_irq = cf->hp700cf_irq; + if (cf->hppacf_irq != HPPACF_IRQ_UNDEF) + ca->ca_irq = cf->hppacf_irq; if (!(ret = config_match(parent, cf, aux))) ca->ca_irq = saved_irq; return ret; diff --git a/sys/arch/hp700/hp700/pim.h b/sys/arch/hppa/hppa/pim.h index c17cdfcd9fb..bf4c99023ee 100644 --- a/sys/arch/hp700/hp700/pim.h +++ b/sys/arch/hppa/hppa/pim.h @@ -1,4 +1,4 @@ -/* $NetBSD: pim.h,v 1.5 2009/11/11 12:57:52 skrll Exp $ */ +/* $NetBSD: pim.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ /* The PIM data for HPMC and TOC contains these register arrays. */ -struct hp700_pim_regs { +struct hppa_pim_regs { /* The general registers. */ uint32_t pim_regs_r0; @@ -128,7 +128,7 @@ struct hp700_pim_regs { }; /* The PIM data for HPMC and LPMC contains this check information. */ -struct hp700_pim_checks { +struct hppa_pim_checks { /* The Check Type. */ uint32_t pim_check_type; @@ -250,7 +250,7 @@ struct hp700_pim_checks { }; /* The PIM data for HPMC and LPMC contains this register array. */ -struct hp700_pim_fpregs { +struct hppa_pim_fpregs { /* The FPU state. */ uint64_t pim_fpregs_fp0; @@ -288,27 +288,27 @@ struct hp700_pim_fpregs { }; /* The HPMC PIM data. */ -struct hp700_pim_hpmc { - struct hp700_pim_regs pim_hpmc_regs; - struct hp700_pim_checks pim_hpmc_checks; - struct hp700_pim_fpregs pim_hpmc_fpregs; +struct hppa_pim_hpmc { + struct hppa_pim_regs pim_hpmc_regs; + struct hppa_pim_checks pim_hpmc_checks; + struct hppa_pim_fpregs pim_hpmc_fpregs; }; /* The LPMC PIM data. */ -struct hp700_pim_lpmc { +struct hppa_pim_lpmc { uint32_t pim_lpmc_hversion_dep[74]; - struct hp700_pim_checks pim_lpmc_checks; - struct hp700_pim_fpregs pim_lpmc_fpregs; + struct hppa_pim_checks pim_lpmc_checks; + struct hppa_pim_fpregs pim_lpmc_fpregs; }; /* The TOC PIM data. */ -struct hp700_pim_toc { - struct hp700_pim_regs pim_toc_regs; +struct hppa_pim_toc { + struct hppa_pim_regs pim_toc_regs; uint32_t pim_toc_hversion_dep; uint32_t pim_toc_cpu_state; }; -struct hp700_pim64_regs { +struct hppa_pim64_regs { /* The general registers. */ uint64_t pim_regs_r0; @@ -393,7 +393,7 @@ struct hp700_pim64_regs { uint64_t pim_regs_iioq_tail; }; -struct hp700_pim64_checks { +struct hppa_pim64_checks { /* The Check Type. */ uint32_t pim_check_type; @@ -423,22 +423,22 @@ struct hp700_pim64_checks { }; /* The PARISC 2.0 HPMC PIM data. */ -struct hp700_pim64_hpmc { - struct hp700_pim64_regs pim_hpmc_regs; - struct hp700_pim64_checks pim_hpmc_checks; - struct hp700_pim_fpregs pim_hpmc_fpregs; +struct hppa_pim64_hpmc { + struct hppa_pim64_regs pim_hpmc_regs; + struct hppa_pim64_checks pim_hpmc_checks; + struct hppa_pim_fpregs pim_hpmc_fpregs; }; /* The PARISC 2.0 LPMC PIM data. */ -struct hp700_pim64_lpmc { +struct hppa_pim64_lpmc { uint64_t pim_lmpc_hversion_dep[74]; - struct hp700_pim64_checks pim_lpmc_checks; - struct hp700_pim_fpregs pim_lpmc_fpregs; + struct hppa_pim64_checks pim_lpmc_checks; + struct hppa_pim_fpregs pim_lpmc_fpregs; }; /* The PARISC 2.0 TOC PIM data. */ -struct hp700_pim64_toc { - struct hp700_pim64_regs pim_toc_regs; +struct hppa_pim64_toc { + struct hppa_pim64_regs pim_toc_regs; uint32_t pim_toc_hversion_dep; uint32_t pim_toc_cpu_state; }; diff --git a/sys/arch/hp700/hp700/sys_machdep.c b/sys/arch/hppa/hppa/sys_machdep.c index 478723c1fe5..6dfd98f80d1 100644 --- a/sys/arch/hp700/hp700/sys_machdep.c +++ b/sys/arch/hppa/hppa/sys_machdep.c @@ -1,10 +1,10 @@ -/* $NetBSD: sys_machdep.c,v 1.7 2007/12/20 23:02:39 dsl Exp $ */ +/* $NetBSD: sys_machdep.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: sys_machdep.c,v 1.1 1998/12/29 18:06:48 mickey Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.7 2007/12/20 23:02:39 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.1 2014/02/24 07:23:43 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/arch/hppa/include/Makefile b/sys/arch/hppa/include/Makefile index 42987d1835f..7f0cfc88877 100644 --- a/sys/arch/hppa/include/Makefile +++ b/sys/arch/hppa/include/Makefile @@ -1,18 +1,20 @@ -# $NetBSD: Makefile,v 1.10 2011/07/17 20:54:41 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2014/02/24 07:23:43 skrll Exp $ INCSDIR= /usr/include/hppa -INCS= ansi.h aout_machdep.h asm.h \ +INCS= ansi.h aout_machdep.h asm.h autoconf.h \ bswap.h byte_swap.h \ - cdefs.h cpufunc.h \ - elf_machdep.h endian_machdep.h exec.h \ + cdefs.h cpu.h cpufunc.h \ + disklabel.h \ + eisa_machdep.h elf_machdep.h endian.h endian_machdep.h exec.h \ float.h frame.h \ - ieee.h ieeefp.h \ + ieee.h ieeefp.h intr.h intrdefs.h iomod.h isa_machdep.h \ int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \ kcore.h \ - limits.h lock.h \ + limits.h loadfile_machdep.h lock.h \ math.h mcontext.h mutex.h \ - param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \ + nvm.h \ + param.h pcb.h pdc.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \ reg.h reloc.h rwlock.h \ setjmp.h signal.h som.h \ trap.h types.h \ diff --git a/sys/arch/hp700/include/autoconf.h b/sys/arch/hppa/include/autoconf.h index 88f7111ccf8..e26de38c9a9 100644 --- a/sys/arch/hp700/include/autoconf.h +++ b/sys/arch/hppa/include/autoconf.h @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.h,v 1.19 2011/07/01 21:02:15 dyoung Exp $ */ +/* $NetBSD: autoconf.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: autoconf.h,v 1.10 2001/05/05 22:33:42 art Exp $ */ @@ -34,7 +34,7 @@ #include <machine/pdc.h> /* 16 should be enough for anyone */ -#define HP700_MAXIOADDRS 16 +#define HPPA_MAXIOADDRS 16 struct confargs { struct iodc_data ca_type; /* iodc-specific type descrition */ @@ -49,7 +49,7 @@ struct confargs { struct { hppa_hpa_t addr; u_int size; - } ca_addrs[HP700_MAXIOADDRS]; + } ca_addrs[HPPA_MAXIOADDRS]; const char *ca_name; /* device name/description */ bus_space_tag_t ca_iot; /* io tag */ int ca_mod; /* module number on the bus */ @@ -62,8 +62,8 @@ struct confargs { int ca_nmodules; /* check for modules 0 to nmodules - 1 */ }; -#define HP700CF_IRQ_UNDEF (-1) -#define hp700cf_irq cf_loc[GEDOENSCF_IRQ] +#define HPPACF_IRQ_UNDEF (-1) +#define hppacf_irq cf_loc[GEDOENSCF_IRQ] /* * This is used for hppa_knownmodules table describing known to this port diff --git a/sys/arch/hp700/include/bootinfo.h b/sys/arch/hppa/include/bootinfo.h index dfaade635a5..a1c4dc4839b 100644 --- a/sys/arch/hp700/include/bootinfo.h +++ b/sys/arch/hppa/include/bootinfo.h @@ -1,4 +1,4 @@ -/* $NetBSD: bootinfo.h,v 1.1 2008/02/03 12:09:40 skrll Exp $ */ +/* $NetBSD: bootinfo.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* * Copyright (c) 1997 diff --git a/sys/arch/hp700/include/bus_defs.h b/sys/arch/hppa/include/bus_defs.h index 2e73a9b480a..5dc92182735 100644 --- a/sys/arch/hp700/include/bus_defs.h +++ b/sys/arch/hppa/include/bus_defs.h @@ -1,4 +1,4 @@ -/* $NetBSD: bus_defs.h,v 1.1 2011/07/01 17:09:59 dyoung Exp $ */ +/* $NetBSD: bus_defs.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: bus.h,v 1.13 2001/07/30 14:15:59 art Exp $ */ diff --git a/sys/arch/hp700/include/bus_funcs.h b/sys/arch/hppa/include/bus_funcs.h index c5b343ab1df..3690e64e4ae 100644 --- a/sys/arch/hp700/include/bus_funcs.h +++ b/sys/arch/hppa/include/bus_funcs.h @@ -1,4 +1,4 @@ -/* $NetBSD: bus_funcs.h,v 1.1 2011/07/01 17:09:59 dyoung Exp $ */ +/* $NetBSD: bus_funcs.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: bus.h,v 1.13 2001/07/30 14:15:59 art Exp $ */ diff --git a/sys/arch/hp700/include/cpu.h b/sys/arch/hppa/include/cpu.h index 5e116503785..a80479f80dc 100644 --- a/sys/arch/hp700/include/cpu.h +++ b/sys/arch/hppa/include/cpu.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.71 2013/02/12 23:02:58 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -130,7 +130,7 @@ extern int cpu_revision; #define HPPA_PMSFUS 0x20 /* ??? */ /* - * Exported definitions unique to hp700/PA-RISC cpu support. + * Exported definitions unique to hppa/PA-RISC cpu support. */ /* @@ -285,8 +285,8 @@ struct cpu_info { u_int ci_imask[NIPL]; - struct hp700_interrupt_register ci_ir; - struct hp700_interrupt_bit ci_ib[HP700_INTERRUPT_BITS]; + struct hppa_interrupt_register ci_ir; + struct hppa_interrupt_bit ci_ib[HPPA_INTERRUPT_BITS]; #if defined(MULTIPROCESSOR) struct lwp *ci_curlwp; /* CPU owner */ diff --git a/sys/arch/hp700/include/disklabel.h b/sys/arch/hppa/include/disklabel.h index 675f448203a..c99d0acf44a 100644 --- a/sys/arch/hp700/include/disklabel.h +++ b/sys/arch/hppa/include/disklabel.h @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.h,v 1.9 2011/08/30 12:39:55 bouyer Exp $ */ +/* $NetBSD: disklabel.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: disklabel.h,v 1.5 2000/07/05 22:37:22 mickey Exp $ */ @@ -54,8 +54,8 @@ #include <sys/dkbad.h> #endif /* HAVE_NBTOOL_CONFIG_H */ struct cpu_disklabel { - struct hp700_lifvol lifvol; - struct hp700_lifdir lifdir[HP700_LIF_NUMDIR]; + struct hppa_lifvol lifvol; + struct hppa_lifdir lifdir[HPPA_LIF_NUMDIR]; #define __HAVE_DISKLABEL_DKBAD struct dkbad bad; /* To make wd(4) happy */ }; diff --git a/sys/arch/hp700/include/eisa_machdep.h b/sys/arch/hppa/include/eisa_machdep.h index c6aa701e422..b4f1cfdd199 100644 --- a/sys/arch/hp700/include/eisa_machdep.h +++ b/sys/arch/hppa/include/eisa_machdep.h @@ -1,4 +1,4 @@ -/* $NetBSD: eisa_machdep.h,v 1.4 2009/11/03 05:07:25 snj Exp $ */ +/* $NetBSD: eisa_machdep.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: eisa_machdep.h,v 1.2 2000/04/18 20:55:02 mickey Exp $ */ diff --git a/sys/arch/hppa/include/endian.h b/sys/arch/hppa/include/endian.h new file mode 100644 index 00000000000..bd9d69f995c --- /dev/null +++ b/sys/arch/hppa/include/endian.h @@ -0,0 +1,3 @@ +/* $NetBSD: endian.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ + +#include <sys/endian.h> diff --git a/sys/arch/hp700/include/hil_machdep.h b/sys/arch/hppa/include/hil_machdep.h index c752452c51a..0666a5691ea 100644 --- a/sys/arch/hp700/include/hil_machdep.h +++ b/sys/arch/hppa/include/hil_machdep.h @@ -1,4 +1,4 @@ -/* $NetBSD: hil_machdep.h,v 1.1 2011/02/15 10:32:57 tsutsui Exp $ */ +/* $NetBSD: hil_machdep.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: hil_machdep.h,v 1.2 2003/06/02 23:27:46 millert Exp $ */ /* diff --git a/sys/arch/hp700/include/intr.h b/sys/arch/hppa/include/intr.h index 165670dbd05..1581fd4bef7 100644 --- a/sys/arch/hp700/include/intr.h +++ b/sys/arch/hppa/include/intr.h @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.22 2012/05/23 16:11:37 skrll Exp $ */ +/* $NetBSD: intr.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: intr.h,v 1.26 2009/12/29 13:11:40 jsing Exp $ */ /*- @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _HP700_INTR_H_ -#define _HP700_INTR_H_ +#ifndef _HPPA_INTR_H_ +#define _HPPA_INTR_H_ #include <machine/psl.h> #include <machine/intrdefs.h> @@ -49,13 +49,13 @@ struct cpu_info; * bits in an interrupt request register, and the maximum number of interrupt * registers. */ -#define HP700_INTERRUPT_BITS (32) -#define CPU_NINTS HP700_INTERRUPT_BITS /* Use this one */ +#define HPPA_INTERRUPT_BITS (32) +#define CPU_NINTS HPPA_INTERRUPT_BITS /* Use this one */ /* - * This describes one HP700 interrupt register. + * This describes one HPPA interrupt register. */ -struct hp700_interrupt_register { +struct hppa_interrupt_register { bool ir_iscpu; const char *ir_name; /* name for this intr reg */ struct cpu_info *ir_ci; /* cpu this intr reg */ @@ -73,11 +73,11 @@ struct hp700_interrupt_register { * register. * * If the 24 most significant bits are set, the low 8 bits are the - * index of the hp700_interrupt_register that this interrupt bit leads + * index of the hppa_interrupt_register that this interrupt bit leads * to, with zero meaning that the interrupt bit is unused. * - * Otherwise these bits correspond to hp700_interrupt_bits. That is, - * these bits are ORed to ipending_new in hp700_intr_ipending() when + * Otherwise these bits correspond to hppa_interrupt_bits. That is, + * these bits are ORed to ipending_new in hppa_intr_ipending() when * an interrupt happens. * * Note that this array is indexed by HP bit number, *not* by "normal" @@ -85,7 +85,7 @@ struct hp700_interrupt_register { * rupt register corresponds to array index 31. */ - unsigned int ir_bits_map[HP700_INTERRUPT_BITS]; + unsigned int ir_bits_map[HPPA_INTERRUPT_BITS]; #define IR_BIT_MASK 0xffffff00 #define IR_BIT_REG(x) (IR_BIT_MASK | (x)) @@ -97,14 +97,14 @@ struct hp700_interrupt_register { int ir_rbits; /* mask of reserved (for lasi/asp) bit numbers */ }; -struct hp700_interrupt_bit { +struct hppa_interrupt_bit { /* * The interrupt register this bit is in. Some handlers, e.g - * apic_intr, don't make use of an hp700_interrupt_register, but are + * apic_intr, don't make use of an hppa_interrupt_register, but are * nested. */ - struct hp700_interrupt_register *ib_reg; + struct hppa_interrupt_register *ib_reg; /* * The priority level associated with this bit, e.g, IPL_BIO, IPL_NET, @@ -135,14 +135,14 @@ struct hp700_interrupt_bit { }; -void hp700_intr_bootstrap(void); -void hp700_intr_initialise(struct cpu_info *); -void hp700_interrupt_register_establish(struct cpu_info *, - struct hp700_interrupt_register *); -void * hp700_intr_establish(int, int (*)(void *), void *, - struct hp700_interrupt_register *, int); -int hp700_intr_allocate_bit(struct hp700_interrupt_register *, int); -void hp700_intr_enable(void); +void hppa_intr_bootstrap(void); +void hppa_intr_initialise(struct cpu_info *); +void hppa_interrupt_register_establish(struct cpu_info *, + struct hppa_interrupt_register *); +void * hppa_intr_establish(int, int (*)(void *), void *, + struct hppa_interrupt_register *, int); +int hppa_intr_allocate_bit(struct hppa_interrupt_register *, int); +void hppa_intr_enable(void); /* splraise()/spllower() are in locore.S */ int splraise(int); @@ -190,4 +190,4 @@ int hppa_ipi_broadcast(u_long); #endif /* !_LOCORE */ -#endif /* !_HP700_INTR_H_ */ +#endif /* !_HPPA_INTR_H_ */ diff --git a/sys/arch/hp700/include/intrdefs.h b/sys/arch/hppa/include/intrdefs.h index 59813b98d08..b6a0f462cea 100644 --- a/sys/arch/hp700/include/intrdefs.h +++ b/sys/arch/hppa/include/intrdefs.h @@ -1,4 +1,4 @@ -/* $NetBSD: intrdefs.h,v 1.1 2012/04/05 21:00:29 skrll Exp $ */ +/* $NetBSD: intrdefs.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ #ifndef _HPPA_INTRDEFS_H_ #define _HPPA_INTRDEFS_H_ diff --git a/sys/arch/hp700/include/iomod.h b/sys/arch/hppa/include/iomod.h index cf044452c07..46dff32552b 100644 --- a/sys/arch/hp700/include/iomod.h +++ b/sys/arch/hppa/include/iomod.h @@ -1,4 +1,4 @@ -/* $NetBSD: iomod.h,v 1.9 2011/01/13 21:15:16 skrll Exp $ */ +/* $NetBSD: iomod.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: iomod.h,v 1.18 2007/10/20 16:41:45 miod Exp $ */ @@ -104,9 +104,9 @@ #define HPPA_IOLEN 0x10000000 #define PDC_ADDR 0xEF000000 /* explained above */ #define IO_ADDR 0xF1000000 -#define SGC_SLOT1 0xF4000000 /* (hp700) */ -#define SGC_SLOT2 0xF8000000 /* (hp700) */ -#define SGC_SIZE 0x02000000 /* (hp700) */ +#define SGC_SLOT1 0xF4000000 /* (hppa) */ +#define SGC_SLOT2 0xF8000000 /* (hppa) */ +#define SGC_SIZE 0x02000000 /* (hppa) */ #define FP_ADDR 0xFFF80000 #define LBCAST_ADDR 0xFFFC0000 #define GBCAST_ADDR 0xFFFE0000 diff --git a/sys/arch/hp700/include/isa_machdep.h b/sys/arch/hppa/include/isa_machdep.h index 1ded3d2aee5..3ff773bf188 100644 --- a/sys/arch/hp700/include/isa_machdep.h +++ b/sys/arch/hppa/include/isa_machdep.h @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.5 2009/11/03 05:07:25 snj Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: isa_machdep.h,v 1.2 1999/05/05 02:36:54 todd Exp $ */ diff --git a/sys/arch/hp700/include/loadfile_machdep.h b/sys/arch/hppa/include/loadfile_machdep.h index 3cd9060ff49..44f19bc0309 100644 --- a/sys/arch/hp700/include/loadfile_machdep.h +++ b/sys/arch/hppa/include/loadfile_machdep.h @@ -1,4 +1,4 @@ -/* $NetBSD: loadfile_machdep.h,v 1.4 2008/04/28 20:23:19 martin Exp $ */ +/* $NetBSD: loadfile_machdep.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -29,8 +29,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _HP700_LOADFILE_MACHDEP_H_ -#define _HP700_LOADFILE_MACHDEP_H_ +#ifndef _HPPA_LOADFILE_MACHDEP_H_ +#define _HPPA_LOADFILE_MACHDEP_H_ #define BOOT_ELF32 @@ -72,4 +72,4 @@ void vcopy(u_long, u_long, u_long *, size_t); void vzero(u_long, u_long *, size_t); #endif -#endif /* ! _HP700_LOADFILE_MACHDEP_H_ */ +#endif /* ! _HPPA_LOADFILE_MACHDEP_H_ */ diff --git a/sys/arch/hp700/include/nvm.h b/sys/arch/hppa/include/nvm.h index eff73db0025..9a9f61d2ccd 100644 --- a/sys/arch/hp700/include/nvm.h +++ b/sys/arch/hppa/include/nvm.h @@ -1,4 +1,4 @@ -/* $NetBSD: nvm.h,v 1.2 2009/05/08 09:33:58 skrll Exp $ */ +/* $NetBSD: nvm.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: nvm.h,v 1.2 1998/11/23 03:28:22 mickey Exp $ */ diff --git a/sys/arch/hppa/include/param.h b/sys/arch/hppa/include/param.h index a5bae62d7db..400dc763cc5 100644 --- a/sys/arch/hppa/include/param.h +++ b/sys/arch/hppa/include/param.h @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.19 2012/02/10 17:35:49 para Exp $ */ +/* $NetBSD: param.h,v 1.20 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: param.h,v 1.12 2001/07/06 02:07:41 provos Exp $ */ @@ -33,6 +33,8 @@ * Machine dependent constants for PA-RISC. */ +#define _MACHINE hppa +#define MACHINE "hppa" #define _MACHINE_ARCH hppa #define MACHINE_ARCH "hppa" #define MID_MACHINE MID_HPPA diff --git a/sys/arch/hp700/include/pci_machdep.h b/sys/arch/hppa/include/pci_machdep.h index db3d23641ac..db3d23641ac 100644 --- a/sys/arch/hp700/include/pci_machdep.h +++ b/sys/arch/hppa/include/pci_machdep.h diff --git a/sys/arch/hp700/include/pdc.h b/sys/arch/hppa/include/pdc.h index 08d2f90bc2d..c8b97f4cc75 100644 --- a/sys/arch/hp700/include/pdc.h +++ b/sys/arch/hppa/include/pdc.h @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.h,v 1.21 2012/02/26 08:44:12 skrll Exp $ */ +/* $NetBSD: pdc.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: pdc.h,v 1.35 2007/07/15 20:03:48 kettenis Exp $ */ @@ -268,7 +268,7 @@ #define PDC_PAT_PROTDOM 74 -#define PDC_MEMMAP 128 /* hp700: return page information */ +#define PDC_MEMMAP 128 /* hppa: return page information */ #define PDC_MEMMAP_HPA 0 /* map module # to HPA */ #define PDC_EEPROM 129 /* Hversion dependent */ diff --git a/sys/arch/hppa/include/types.h b/sys/arch/hppa/include/types.h index ab8b90fd53b..753266d041d 100644 --- a/sys/arch/hppa/include/types.h +++ b/sys/arch/hppa/include/types.h @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.22 2012/01/18 09:35:48 skrll Exp $ */ +/* $NetBSD: types.h,v 1.23 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: types.h,v 1.6 2001/08/11 01:58:34 art Exp $ */ @@ -95,5 +95,9 @@ extern const char __CONCAT(name,_ras_start[]), __CONCAT(name,_ras_end[]) #define __HAVE_COMMON___TLS_GET_ADDR #define __HAVE___LWP_GETPRIVATE_FAST #define __HAVE_TLS_VARIANT_I +#define __HAVE_NEW_STYLE_BUS_H + +#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS +#define __HAVE_MM_MD_KERNACC #endif /* _HPPA_TYPES_H_ */ diff --git a/sys/arch/hp700/stand/Makefile b/sys/arch/hppa/stand/Makefile index f89cdc278b4..37f814c7b9f 100644 --- a/sys/arch/hp700/stand/Makefile +++ b/sys/arch/hppa/stand/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2008/05/10 19:11:59 skrll Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:43 skrll Exp $ # $OpenBSD: Makefile,v 1.2 2000/05/31 19:59:31 mickey Exp $ diff --git a/sys/arch/hp700/stand/Makefile.buildboot b/sys/arch/hppa/stand/Makefile.buildboot index dcb106638a9..a205163499e 100644 --- a/sys/arch/hp700/stand/Makefile.buildboot +++ b/sys/arch/hppa/stand/Makefile.buildboot @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.buildboot,v 1.15 2014/01/12 15:26:29 tsutsui Exp $ +# $NetBSD: Makefile.buildboot,v 1.1 2014/02/24 07:23:43 skrll Exp $ RELOC= 120000 HEAP_LIMIT=0x1c0000 @@ -38,9 +38,9 @@ CLEANFILES+= vers.c vers.c: ${.CURDIR}/version ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \ - ${.CURDIR}/version hp700 ${NEWVERSWHAT} + ${.CURDIR}/version hppa ${NEWVERSWHAT} -CPPFLAGS+= -D_STANDALONE -Dhp700 ${DEBUGFLAGS} +CPPFLAGS+= -D_STANDALONE -Dhppa ${DEBUGFLAGS} CPPFLAGS+= -DRELOC=0x${RELOC} -DHEAP_LIMIT=${HEAP_LIMIT} CPPFLAGS+= -DNO_NET diff --git a/sys/arch/hp700/stand/Makefile.inc b/sys/arch/hppa/stand/Makefile.inc index 4bc374432e3..1775c5940d5 100644 --- a/sys/arch/hp700/stand/Makefile.inc +++ b/sys/arch/hppa/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.9 2013/07/16 10:05:38 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.1 2014/02/24 07:23:43 skrll Exp $ BINDIR= /usr/mdec diff --git a/sys/arch/hp700/stand/boot/Makefile b/sys/arch/hppa/stand/boot/Makefile index 10f67cf53b0..e50cd2391bf 100644 --- a/sys/arch/hp700/stand/boot/Makefile +++ b/sys/arch/hppa/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/01/09 16:03:26 skrll Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:43 skrll Exp $ # $OpenBSD: Makefile,v 1.10 2000/05/31 19:56:51 mickey Exp $ diff --git a/sys/arch/hp700/stand/boot/boot.c b/sys/arch/hppa/stand/boot/boot.c index 6b5ca9ec46e..b63f1f5666d 100644 --- a/sys/arch/hp700/stand/boot/boot.c +++ b/sys/arch/hppa/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $NetBSD: boot.c,v 1.13 2014/01/15 21:52:13 skrll Exp $ */ +/* $NetBSD: boot.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /*- * Copyright (c) 1982, 1986, 1990, 1993 @@ -62,13 +62,13 @@ #include <sys/reboot.h> #include <sys/boot_flag.h> -#include <arch/hp700/stand/common/libsa.h> +#include <arch/hppa/stand/common/libsa.h> #include <lib/libsa/loadfile.h> #include <machine/pdc.h> #include <machine/vmparam.h> -#include <arch/hp700/stand/common/dev_hppa.h> +#include <arch/hppa/stand/common/dev_hppa.h> #include "bootinfo.h" @@ -103,7 +103,7 @@ char *names[] = { void boot(dev_t boot_dev); int main(void); void getbootdev(int *); -void exec_hp700(char *, u_long, int); +void exec_hppa(char *, u_long, int); int tgets(char *); void _rtt(void); @@ -169,7 +169,7 @@ main(void) BI_ADD(&U.bi_file, BTINFO_KERNELFILE, size); } - exec_hp700(filename, 0, howto); + exec_hppa(filename, 0, howto); printf("boot: %s\n", strerror(errno)); } } @@ -219,7 +219,7 @@ getbootdev(int *boot_howto) (((x) + sizeof(u_long) - 1) & ~(sizeof(u_long) - 1)) void -exec_hp700(char *file, u_long loadaddr, int boot_howto) +exec_hppa(char *file, u_long loadaddr, int boot_howto) { #ifdef EXEC_DEBUG extern int debug; diff --git a/sys/arch/hp700/stand/boot/bootinfo.c b/sys/arch/hppa/stand/boot/bootinfo.c index 737e4945d8c..fc35b5f6993 100644 --- a/sys/arch/hp700/stand/boot/bootinfo.c +++ b/sys/arch/hppa/stand/boot/bootinfo.c @@ -1,4 +1,4 @@ -/* $NetBSD: bootinfo.c,v 1.2 2008/04/28 20:23:19 martin Exp $ */ +/* $NetBSD: bootinfo.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. diff --git a/sys/arch/hp700/stand/boot/bootinfo.h b/sys/arch/hppa/stand/boot/bootinfo.h index 0d5221cd595..66d0d777ab3 100644 --- a/sys/arch/hp700/stand/boot/bootinfo.h +++ b/sys/arch/hppa/stand/boot/bootinfo.h @@ -1,4 +1,4 @@ -/* $NetBSD: bootinfo.h,v 1.2 2008/04/28 20:23:19 martin Exp $ */ +/* $NetBSD: bootinfo.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. diff --git a/sys/arch/hp700/stand/boot/conf.c b/sys/arch/hppa/stand/boot/conf.c index fe43e434806..0b25c5f03cb 100644 --- a/sys/arch/hp700/stand/boot/conf.c +++ b/sys/arch/hppa/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.6 2009/11/03 05:07:25 snj Exp $ */ +/* $NetBSD: conf.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: conf.c,v 1.12 2000/05/30 22:02:28 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/types.h> -#include <arch/hp700/stand/common/libsa.h> +#include <arch/hppa/stand/common/libsa.h> #include <lib/libsa/ufs.h> #include <lib/libsa/cd9660.h> #include <dev/cons.h> diff --git a/sys/arch/hp700/stand/boot/ld.script b/sys/arch/hppa/stand/boot/ld.script index 41afa3746f4..265e9687eac 100644 --- a/sys/arch/hp700/stand/boot/ld.script +++ b/sys/arch/hppa/stand/boot/ld.script @@ -1,4 +1,4 @@ -/* $NetBSD: ld.script,v 1.1 2002/06/06 19:48:11 fredette Exp $ */ +/* $NetBSD: ld.script,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: ld.script,v 1.2 1999/04/20 20:02:37 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/boot/tgets.c b/sys/arch/hppa/stand/boot/tgets.c index 757cd4d9d9a..b5b8338bc6c 100644 --- a/sys/arch/hp700/stand/boot/tgets.c +++ b/sys/arch/hppa/stand/boot/tgets.c @@ -1,4 +1,4 @@ -/* $NetBSD: tgets.c,v 1.6 2009/01/12 11:32:43 tsutsui Exp $ */ +/* $NetBSD: tgets.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /*- * Copyright (c) 1993 @@ -32,7 +32,7 @@ */ #include <sys/types.h> -#include <arch/hp700/stand/common/libsa.h> +#include <arch/hppa/stand/common/libsa.h> #include <lib/libsa/net.h> int tgets(char *); diff --git a/sys/arch/hp700/stand/boot/version b/sys/arch/hppa/stand/boot/version index 5e959118bba..65d9adc345c 100644 --- a/sys/arch/hp700/stand/boot/version +++ b/sys/arch/hppa/stand/boot/version @@ -1,4 +1,4 @@ -$NetBSD: version,v 1.5 2008/02/03 12:09:41 skrll Exp $ +$NetBSD: version,v 1.1 2014/02/24 07:23:43 skrll Exp $ 1.1: Initial version 1.2: Support disklabel. diff --git a/sys/arch/hp700/stand/cdboot/Makefile b/sys/arch/hppa/stand/cdboot/Makefile index c02f91ff128..a104b0c94fc 100644 --- a/sys/arch/hp700/stand/cdboot/Makefile +++ b/sys/arch/hppa/stand/cdboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/06/12 14:04:53 skrll Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:43 skrll Exp $ PROG= cdboot PROGSOURCE= srt0.S cdboot.c conf.c diff --git a/sys/arch/hp700/stand/cdboot/cdboot.c b/sys/arch/hppa/stand/cdboot/cdboot.c index 2ab8b9aabdf..754725c2080 100644 --- a/sys/arch/hp700/stand/cdboot/cdboot.c +++ b/sys/arch/hppa/stand/cdboot/cdboot.c @@ -1,4 +1,4 @@ -/* $NetBSD: cdboot.c,v 1.3 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: cdboot.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /*- * Copyright (c) 1982, 1986, 1990, 1993 @@ -62,13 +62,13 @@ #include <sys/reboot.h> #include <sys/boot_flag.h> -#include <arch/hp700/stand/common/libsa.h> +#include <arch/hppa/stand/common/libsa.h> #include <lib/libsa/loadfile.h> #include <machine/pdc.h> #include <machine/vmparam.h> -#include <arch/hp700/stand/common/dev_hppa.h> +#include <arch/hppa/stand/common/dev_hppa.h> /* * Boot program... bits in `howto' determine whether boot stops to diff --git a/sys/arch/hp700/stand/cdboot/conf.c b/sys/arch/hppa/stand/cdboot/conf.c index 80b79d9e795..3e852e4fde5 100644 --- a/sys/arch/hp700/stand/cdboot/conf.c +++ b/sys/arch/hppa/stand/cdboot/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.2 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: conf.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: conf.c,v 1.12 2000/05/30 22:02:28 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/types.h> -#include <arch/hp700/stand/common/libsa.h> +#include <arch/hppa/stand/common/libsa.h> #include <lib/libsa/ufs.h> #include <lib/libsa/cd9660.h> #include <dev/cons.h> diff --git a/sys/arch/hp700/stand/cdboot/ld.script b/sys/arch/hppa/stand/cdboot/ld.script index 90c59af2832..d8986aa2607 100644 --- a/sys/arch/hp700/stand/cdboot/ld.script +++ b/sys/arch/hppa/stand/cdboot/ld.script @@ -1,4 +1,4 @@ -/* $NetBSD: ld.script,v 1.1 2008/05/10 19:11:59 skrll Exp $ */ +/* $NetBSD: ld.script,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: ld.script,v 1.1 2003/03/28 22:42:26 mickey Exp $ */ diff --git a/sys/arch/hppa/stand/cdboot/version b/sys/arch/hppa/stand/cdboot/version new file mode 100644 index 00000000000..f3ed38bfb7f --- /dev/null +++ b/sys/arch/hppa/stand/cdboot/version @@ -0,0 +1,3 @@ +$NetBSD: version,v 1.1 2014/02/24 07:23:43 skrll Exp $ + +1.0: Initial version diff --git a/sys/arch/hp700/stand/common/cons.c b/sys/arch/hppa/stand/common/cons.c index 78592748116..708ab202b9d 100644 --- a/sys/arch/hp700/stand/common/cons.c +++ b/sys/arch/hppa/stand/common/cons.c @@ -1,4 +1,4 @@ -/* $NetBSD: cons.c,v 1.5 2011/02/08 20:20:14 rmind Exp $ */ +/* $NetBSD: cons.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* * Copyright (c) 1988 University of Utah. diff --git a/sys/arch/hp700/stand/common/ct.c b/sys/arch/hppa/stand/common/ct.c index c83bb63a0c6..94592276c19 100644 --- a/sys/arch/hp700/stand/common/ct.c +++ b/sys/arch/hppa/stand/common/ct.c @@ -1,4 +1,4 @@ -/* $NetBSD: ct.c,v 1.5 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: ct.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: ct.c,v 1.5 1999/04/20 20:01:01 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/common/dev_hppa.c b/sys/arch/hppa/stand/common/dev_hppa.c index cb026e591bf..5967be5ac2b 100644 --- a/sys/arch/hp700/stand/common/dev_hppa.c +++ b/sys/arch/hppa/stand/common/dev_hppa.c @@ -1,4 +1,4 @@ -/* $NetBSD: dev_hppa.c,v 1.12 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: dev_hppa.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: dev_hppa.c,v 1.5 1999/04/20 20:01:01 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/common/dev_hppa.h b/sys/arch/hppa/stand/common/dev_hppa.h index ccb15e6e0c0..b3f94b5bca5 100644 --- a/sys/arch/hp700/stand/common/dev_hppa.h +++ b/sys/arch/hppa/stand/common/dev_hppa.h @@ -1,4 +1,4 @@ -/* $NetBSD: dev_hppa.h,v 1.5 2009/01/22 07:57:17 skrll Exp $ */ +/* $NetBSD: dev_hppa.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: dev_hppa.h,v 1.3 1999/04/20 20:01:01 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/common/dk.c b/sys/arch/hppa/stand/common/dk.c index ba26a59785b..d432653b2ee 100644 --- a/sys/arch/hp700/stand/common/dk.c +++ b/sys/arch/hppa/stand/common/dk.c @@ -1,4 +1,4 @@ -/* $NetBSD: dk.c,v 1.10 2009/05/08 09:33:59 skrll Exp $ */ +/* $NetBSD: dk.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: dk.c,v 1.5 1999/04/20 20:01:01 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/common/exec_hppa.c b/sys/arch/hppa/stand/common/exec_hppa.c index 985c35a2471..81fd984f081 100644 --- a/sys/arch/hp700/stand/common/exec_hppa.c +++ b/sys/arch/hppa/stand/common/exec_hppa.c @@ -1,4 +1,4 @@ -/* $NetBSD: exec_hppa.c,v 1.5 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: exec_hppa.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: exec_hppa.c,v 1.7 1999/05/06 02:13:15 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/common/exec_som.c b/sys/arch/hppa/stand/common/exec_som.c index c36b07b5bf5..dcb551ddfa0 100644 --- a/sys/arch/hp700/stand/common/exec_som.c +++ b/sys/arch/hppa/stand/common/exec_som.c @@ -1,4 +1,4 @@ -/* $NetBSD: exec_som.c,v 1.4 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: exec_som.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: exec_som.c,v 1.1 1999/12/23 04:10:30 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/common/itecons.c b/sys/arch/hppa/stand/common/itecons.c index 2d90f0f10b6..24371dcdcc7 100644 --- a/sys/arch/hp700/stand/common/itecons.c +++ b/sys/arch/hppa/stand/common/itecons.c @@ -1,4 +1,4 @@ -/* $NetBSD: itecons.c,v 1.11 2014/01/15 21:52:13 skrll Exp $ */ +/* $NetBSD: itecons.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: itecons.c,v 1.6 1999/04/20 20:01:02 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/common/lf.c b/sys/arch/hppa/stand/common/lf.c index c23af4dc526..5d2b49d1652 100644 --- a/sys/arch/hp700/stand/common/lf.c +++ b/sys/arch/hppa/stand/common/lf.c @@ -1,4 +1,4 @@ -/* $NetBSD: lf.c,v 1.5 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: lf.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: lf.c,v 1.3 1999/04/20 20:01:02 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/common/libsa.h b/sys/arch/hppa/stand/common/libsa.h index b5ff136afa8..fe27f15483b 100644 --- a/sys/arch/hp700/stand/common/libsa.h +++ b/sys/arch/hppa/stand/common/libsa.h @@ -1,4 +1,4 @@ -/* $NetBSD: libsa.h,v 1.9 2011/01/22 19:19:18 joerg Exp $ */ +/* $NetBSD: libsa.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: libsa.h,v 1.7 1999/12/23 04:07:47 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/common/lif.c b/sys/arch/hppa/stand/common/lif.c index e99c7f802e4..78e16d5cdb5 100644 --- a/sys/arch/hp700/stand/common/lif.c +++ b/sys/arch/hppa/stand/common/lif.c @@ -1,4 +1,4 @@ -/* $NetBSD: lif.c,v 1.11 2014/01/15 21:52:13 skrll Exp $ */ +/* $NetBSD: lif.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: lif.c,v 1.7 2001/06/09 03:54:41 mickey Exp $ */ @@ -35,13 +35,13 @@ extern int debug; struct file { - char f_buf[HP700_LIF_FILESTART];/* buffer for lif volume header and dir */ - struct hp700_lifvol *f_lp; /* lif volume header pointer */ - struct hp700_lifdir *f_ld; /* lif dir pointer */ + char f_buf[HPPA_LIF_FILESTART];/* buffer for lif volume header and dir */ + struct hppa_lifvol *f_lp; /* lif volume header pointer */ + struct hppa_lifdir *f_ld; /* lif dir pointer */ int f_nfiles; /* gross number for lif dir entries */ off_t f_seek; /* seek pointer for file read */ - struct hp700_lifdir *f_rd; /* lif dir pointer for readdir */ + struct hppa_lifdir *f_rd; /* lif dir pointer for readdir */ int f_isdir; /* special hacky flag for '.' dir */ int f_count; /* this file length */ @@ -52,9 +52,9 @@ int lif_open(const char *path, struct open_file *f) { struct file *fp; - struct hp700_lifdir *dp; + struct hppa_lifdir *dp; const char *p, *q; - struct hp700_lifload load; + struct hppa_lifload load; int err, l; size_t buf_size; @@ -64,7 +64,7 @@ lif_open(const char *path, struct open_file *f) #endif fp = alloc(sizeof(*fp)); - /* XXX we're assuming here that sizeof(fp->f_buf) >= HP700_LIF_FILESTART */ + /* XXX we're assuming here that sizeof(fp->f_buf) >= HPPA_LIF_FILESTART */ err = (*f->f_dev->dv_strategy)(f->f_devdata, F_READ, 0, sizeof(fp->f_buf), &fp->f_buf, &buf_size); @@ -73,14 +73,14 @@ lif_open(const char *path, struct open_file *f) if (debug) printf("lif_open: unable to read LIF header (%d)\n", err); #endif - } else if ((fp->f_lp = (struct hp700_lifvol *)fp->f_buf)->vol_id == - HP700_LIF_VOL_ID) { + } else if ((fp->f_lp = (struct hppa_lifvol *)fp->f_buf)->vol_id == + HPPA_LIF_VOL_ID) { f->f_fsdata = fp; - fp->f_ld = (struct hp700_lifdir *)(fp->f_buf + HP700_LIF_DIRSTART); + fp->f_ld = (struct hppa_lifdir *)(fp->f_buf + HPPA_LIF_DIRSTART); fp->f_seek = 0; fp->f_rd = fp->f_ld; - fp->f_nfiles = hp700_lifstob(fp->f_lp->vol_dirsize) / - sizeof(struct hp700_lifdir); + fp->f_nfiles = hppa_lifstob(fp->f_lp->vol_dirsize) / + sizeof(struct hppa_lifdir); /* no dirs on the lif */ for (p = path + (l = strlen(path)); p >= path; p--) @@ -117,7 +117,7 @@ lif_open(const char *path, struct open_file *f) } } if (!err) { - fp->f_off = hp700_lifstodb(dp->dir_addr); + fp->f_off = hppa_lifstodb(dp->dir_addr); if (!(err =(f->f_dev->dv_strategy)(f->f_devdata, F_READ, fp->f_off, sizeof(load), &load, &buf_size)) && buf_size == sizeof(load)) { diff --git a/sys/arch/hp700/stand/common/machdep.c b/sys/arch/hppa/stand/common/machdep.c index 36ed84d995b..deb0a973bd9 100644 --- a/sys/arch/hp700/stand/common/machdep.c +++ b/sys/arch/hppa/stand/common/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.4 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: machdep.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: machdep.c,v 1.6 2001/06/04 22:25:52 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/common/milli_tiny.S b/sys/arch/hppa/stand/common/milli_tiny.S index 53b7e72277c..9afaf43ba61 100644 --- a/sys/arch/hp700/stand/common/milli_tiny.S +++ b/sys/arch/hppa/stand/common/milli_tiny.S @@ -1,4 +1,4 @@ -; $NetBSD: milli_tiny.S,v 1.1 2008/06/12 14:08:29 skrll Exp $ +; $NetBSD: milli_tiny.S,v 1.1 2014/02/24 07:23:43 skrll Exp $ ; Copyright (c) 2003 ITOH Yasufumi. ; All rights reserved. diff --git a/sys/arch/hp700/stand/common/pdc.c b/sys/arch/hppa/stand/common/pdc.c index bd5a19a848f..a1640656c06 100644 --- a/sys/arch/hp700/stand/common/pdc.c +++ b/sys/arch/hppa/stand/common/pdc.c @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.c,v 1.12 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: pdc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: pdc.c,v 1.10 1999/05/06 02:27:44 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/common/srt0.S b/sys/arch/hppa/stand/common/srt0.S index 28ea5afae90..f29fd35da50 100644 --- a/sys/arch/hp700/stand/common/srt0.S +++ b/sys/arch/hppa/stand/common/srt0.S @@ -1,4 +1,4 @@ -/* $NetBSD: srt0.S,v 1.3 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: srt0.S,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: srt0.S,v 1.7 2001/05/16 23:57:35 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/common/time.c b/sys/arch/hppa/stand/common/time.c index a6198035277..d330dead6b6 100644 --- a/sys/arch/hp700/stand/common/time.c +++ b/sys/arch/hppa/stand/common/time.c @@ -1,4 +1,4 @@ -/* $NetBSD: time.c,v 1.4 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: time.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: time.c,v 1.3 1999/02/13 04:43:18 mickey Exp $ */ diff --git a/sys/arch/hp700/stand/mkboot/Makefile b/sys/arch/hppa/stand/mkboot/Makefile index 4b6af2d9b1b..8b3aeab95ed 100644 --- a/sys/arch/hp700/stand/mkboot/Makefile +++ b/sys/arch/hppa/stand/mkboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2009/11/07 17:56:14 skrll Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:43 skrll Exp $ NOMAN= # defined diff --git a/sys/arch/hp700/stand/mkboot/mkboot.c b/sys/arch/hppa/stand/mkboot/mkboot.c index 0f6c31b21fc..b5039b986c4 100644 --- a/sys/arch/hp700/stand/mkboot/mkboot.c +++ b/sys/arch/hppa/stand/mkboot/mkboot.c @@ -1,4 +1,4 @@ -/* $NetBSD: mkboot.c,v 1.8 2012/02/24 18:45:20 skrll Exp $ */ +/* $NetBSD: mkboot.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* $OpenBSD: mkboot.c,v 1.9 2001/05/17 00:57:55 pvalchev Exp $ */ @@ -136,9 +136,9 @@ int main(int argc, char **argv) { int to, n, pos, c; - char buf[HP700_LIF_FILESTART]; - struct hp700_lifvol *lifv = (struct hp700_lifvol *)buf; - struct hp700_lifdir *lifd = (struct hp700_lifdir *)(buf + HP700_LIF_DIRSTART); + char buf[HPPA_LIF_FILESTART]; + struct hppa_lifvol *lifv = (struct hppa_lifvol *)buf; + struct hppa_lifdir *lifd = (struct hppa_lifdir *)(buf + HPPA_LIF_DIRSTART); while ((c = getopt(argc, argv, "vl:")) != -1) { switch (c) { @@ -164,35 +164,35 @@ main(int argc, char **argv) memset(buf, 0, sizeof(buf)); /* record volume info */ - lifv->vol_id = htobe16(HP700_LIF_VOL_ID); + lifv->vol_id = htobe16(HPPA_LIF_VOL_ID); strncpy(lifv->vol_label, "MKBOOT", 6); - lifv->vol_addr = htobe32(hp700_btolifs(HP700_LIF_DIRSTART)); - lifv->vol_oct = htobe16(HP700_LIF_VOL_OCT); - lifv->vol_dirsize = htobe32(hp700_btolifs(HP700_LIF_DIRSIZE)); + lifv->vol_addr = htobe32(hppa_btolifs(HPPA_LIF_DIRSTART)); + lifv->vol_oct = htobe16(HPPA_LIF_VOL_OCT); + lifv->vol_dirsize = htobe32(hppa_btolifs(HPPA_LIF_DIRSIZE)); lifv->vol_version = htobe16(1); lifv->vol_number = htobe32(1); lifv->vol_lastvol = htobe32(1); - lifv->vol_length = HP700_LIF_FILESTART; /* ... so far. */ + lifv->vol_length = HPPA_LIF_FILESTART; /* ... so far. */ bcddate(to_file, lifv->vol_toc); - lifv->ipl_addr = htobe32(HP700_LIF_FILESTART); + lifv->ipl_addr = htobe32(HPPA_LIF_FILESTART); argv += optind; argc -= optind; optind = 0; - for (pos = HP700_LIF_FILESTART; optind < argc; optind++) { + for (pos = HPPA_LIF_FILESTART; optind < argc; optind++) { /* output bootfile */ if (lseek(to, pos, SEEK_SET) < 0) err(1, "%s: lseek", to_file); - lifd[optind].dir_addr = htobe32(hp700_btolifs(pos)); - n = hp700_btolifs(putfile(argv[optind], to)); + lifd[optind].dir_addr = htobe32(hppa_btolifs(pos)); + n = hppa_btolifs(putfile(argv[optind], to)); if (lifv->ipl_entry == 0) { lifv->ipl_entry = htobe32(loadpoint + entry); - lifv->ipl_size = htobe32(hp700_lifstob(n)); - lifd[optind].dir_type = htobe16(HP700_LIF_DIR_ISL); + lifv->ipl_size = htobe32(hppa_lifstob(n)); + lifd[optind].dir_type = htobe16(HPPA_LIF_DIR_ISL); lifd[optind].dir_implement = 0; } else { - lifd[optind].dir_type = htobe16(HP700_LIF_DIR_TYPE); + lifd[optind].dir_type = htobe16(HPPA_LIF_DIR_TYPE); lifd[optind].dir_implement = htobe32(loadpoint + entry); } @@ -200,10 +200,10 @@ main(int argc, char **argv) sizeof(lifd[optind].dir_name)); lifd[optind].dir_length = htobe32(n); bcddate(argv[optind], lifd[optind].dir_toc); - lifd[optind].dir_flag = htobe16(HP700_LIF_DIR_FLAG); + lifd[optind].dir_flag = htobe16(HPPA_LIF_DIR_FLAG); lifv->vol_length += n; - pos += hp700_lifstob(n); + pos += hppa_lifstob(n); } /* terminate the directory */ @@ -213,7 +213,7 @@ main(int argc, char **argv) lifv->vol_length = htobe32(lifv->vol_length); /* output volume/directory header info */ - if (lseek(to, HP700_LIF_VOLSTART, SEEK_SET) < 0) + if (lseek(to, HPPA_LIF_VOLSTART, SEEK_SET) < 0) err(1, "%s: lseek", to_file); if (write(to, buf, sizeof(buf)) != sizeof(buf)) err(1, "%s: write LIF volume", to_file); @@ -232,7 +232,7 @@ putfile(char *from_file, int to) char buf[2048]; int n, total; int from, check_sum = 0; - struct hp700_lifload load; + struct hppa_lifload load; Elf32_External_Ehdr elf_header; Elf32_External_Phdr *elf_segments; int i, header_count, memory_needed, elf_load_image_segment; diff --git a/sys/arch/hp700/stand/xxboot/Makefile b/sys/arch/hppa/stand/xxboot/Makefile index cc168b4f6ad..02668357eed 100644 --- a/sys/arch/hp700/stand/xxboot/Makefile +++ b/sys/arch/hppa/stand/xxboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2014/01/12 15:26:29 tsutsui Exp $ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:43 skrll Exp $ PROG= xxboot NOMAN= # defined diff --git a/sys/arch/hp700/stand/xxboot/README.ipl b/sys/arch/hppa/stand/xxboot/README.ipl index 56ee5d78a1c..5fceae35305 100644 --- a/sys/arch/hp700/stand/xxboot/README.ipl +++ b/sys/arch/hppa/stand/xxboot/README.ipl @@ -1,4 +1,4 @@ -# $NetBSD: README.ipl,v 1.2 2005/12/11 12:17:25 christos Exp $ +# $NetBSD: README.ipl,v 1.1 2014/02/24 07:23:43 skrll Exp $ Coding note: diff --git a/sys/arch/hp700/stand/xxboot/iplsum.c b/sys/arch/hppa/stand/xxboot/iplsum.c index 6e226ad8aed..2141684c5de 100644 --- a/sys/arch/hp700/stand/xxboot/iplsum.c +++ b/sys/arch/hppa/stand/xxboot/iplsum.c @@ -1,4 +1,4 @@ -/* $NetBSD: iplsum.c,v 1.7 2013/11/14 13:02:57 skrll Exp $ */ +/* $NetBSD: iplsum.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* * Calculate 32bit checksum of IPL and store in a certain location diff --git a/sys/arch/hp700/stand/xxboot/main.c b/sys/arch/hppa/stand/xxboot/main.c index d6b7f84f656..124075c1a79 100644 --- a/sys/arch/hp700/stand/xxboot/main.c +++ b/sys/arch/hppa/stand/xxboot/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.11 2013/06/15 00:41:56 christos Exp $ */ +/* $NetBSD: main.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* * Copyright (c) 2003 ITOH Yasufumi. diff --git a/sys/arch/hp700/stand/xxboot/readufs.c b/sys/arch/hppa/stand/xxboot/readufs.c index d1aa3b36fee..115e528e458 100644 --- a/sys/arch/hp700/stand/xxboot/readufs.c +++ b/sys/arch/hppa/stand/xxboot/readufs.c @@ -1,4 +1,4 @@ -/* $NetBSD: readufs.c,v 1.11 2013/01/22 09:39:14 dholland Exp $ */ +/* $NetBSD: readufs.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* from Id: readufs.c,v 1.9 2003/12/16 13:54:11 itohy Exp */ /* diff --git a/sys/arch/hp700/stand/xxboot/readufs.h b/sys/arch/hppa/stand/xxboot/readufs.h index f1ab22459d2..1c40c28361d 100644 --- a/sys/arch/hp700/stand/xxboot/readufs.h +++ b/sys/arch/hppa/stand/xxboot/readufs.h @@ -1,4 +1,4 @@ -/* $NetBSD: readufs.h,v 1.8 2013/06/18 18:18:58 christos Exp $ */ +/* $NetBSD: readufs.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* from Id: readufs.h,v 1.10 2003/12/16 13:54:11 itohy Exp */ /* diff --git a/sys/arch/hp700/stand/xxboot/readufs_ffs.c b/sys/arch/hppa/stand/xxboot/readufs_ffs.c index b154806d9e7..11d542d037a 100644 --- a/sys/arch/hp700/stand/xxboot/readufs_ffs.c +++ b/sys/arch/hppa/stand/xxboot/readufs_ffs.c @@ -1,4 +1,4 @@ -/* $NetBSD: readufs_ffs.c,v 1.7 2013/06/23 02:06:05 dholland Exp $ */ +/* $NetBSD: readufs_ffs.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* from Id: readufs_ffs.c,v 1.8 2004/06/12 04:26:39 itohy Exp */ /* diff --git a/sys/arch/hp700/stand/xxboot/readufs_lfs.c b/sys/arch/hppa/stand/xxboot/readufs_lfs.c index 28f86ed7f02..1c257eb35ff 100644 --- a/sys/arch/hp700/stand/xxboot/readufs_lfs.c +++ b/sys/arch/hppa/stand/xxboot/readufs_lfs.c @@ -1,4 +1,4 @@ -/* $NetBSD: readufs_lfs.c,v 1.8 2013/06/15 00:42:16 christos Exp $ */ +/* $NetBSD: readufs_lfs.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ /* from Id: readufs_lfs.c,v 1.8 2003/12/16 13:54:11 itohy Exp */ /* diff --git a/sys/arch/hp700/stand/xxboot/start.S b/sys/arch/hppa/stand/xxboot/start.S index 375be6ee8e7..6fb9186ec04 100644 --- a/sys/arch/hp700/stand/xxboot/start.S +++ b/sys/arch/hppa/stand/xxboot/start.S @@ -1,4 +1,4 @@ -; $NetBSD: start.S,v 1.3 2012/02/26 07:23:24 skrll Exp $ +; $NetBSD: start.S,v 1.1 2014/02/24 07:23:43 skrll Exp $ ; Copyright (c) 2003 ITOH Yasufumi. ; All rights reserved. @@ -197,7 +197,7 @@ iomcmd: ldil L%IOMOD_CMD,%r2 str_startup: .string "\r\n\n" - .stringz "NetBSD/hp700 FFS/LFS Primary Bootstrap\r\n\n" + .stringz "NetBSD/hppa FFS/LFS Primary Bootstrap\r\n\n" str_reset: .stringz "\r\nresetting..." .align 4 diff --git a/sys/dev/TODO.audiomp b/sys/dev/TODO.audiomp index e02cf5837c4..44d4ae23cca 100644 --- a/sys/dev/TODO.audiomp +++ b/sys/dev/TODO.audiomp @@ -6,7 +6,7 @@ arch/amiga/dev/toccata.c done arch/arm/iomd/vidcaudio.c done port-acorn32 arch/arm/xscale/pxa2x0_ac97.c done arch/dreamcast/dev/g2/aica.c done port-dreamcast -arch/hp700/gsc/harmony.c done port-hp700 +arch/hppa/gsc/harmony.c done port-hppa arch/hpcmips/vr/vraiu.c done arch/macppc/dev/awacs.c done port-macppc arch/macppc/dev/snapper.c done port-macppc, TAS3004 only diff --git a/sys/dev/dkwedge/dkwedge_bsdlabel.c b/sys/dev/dkwedge/dkwedge_bsdlabel.c index 719a7417d50..e856335b816 100644 --- a/sys/dev/dkwedge/dkwedge_bsdlabel.c +++ b/sys/dev/dkwedge/dkwedge_bsdlabel.c @@ -1,4 +1,4 @@ -/* $NetBSD: dkwedge_bsdlabel.c,v 1.17 2012/06/07 16:15:31 mlelstv Exp $ */ +/* $NetBSD: dkwedge_bsdlabel.c,v 1.18 2014/02/24 07:23:43 skrll Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dkwedge_bsdlabel.c,v 1.17 2012/06/07 16:15:31 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dkwedge_bsdlabel.c,v 1.18 2014/02/24 07:23:43 skrll Exp $"); #include <sys/param.h> #ifdef _KERNEL @@ -118,7 +118,7 @@ static const struct disklabel_location { luna68k, mac68k, macppc, news68k, newsmips, pc532, pdp11, pmax, vax, x68k */ { 0, 128 }, /* sparc, sun68k */ - { 1, 0 }, /* amd64, arc, arm, bebox, cobalt, evbppc, hp700, + { 1, 0 }, /* amd64, arc, arm, bebox, cobalt, evbppc, hppa, hpcarm, hpcmips, i386, ibmnws, mipsco, mvmeppc, ofppc, pmppc, prep, sandpoint, sbmips, sgimips, sh3 */ diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c index e3127e36756..b87ed83985f 100644 --- a/sys/dev/ic/i82596.c +++ b/sys/dev/ic/i82596.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82596.c,v 1.30 2013/12/09 09:35:16 wiz Exp $ */ +/* $NetBSD: i82596.c,v 1.31 2014/02/24 07:23:43 skrll Exp $ */ /* * Copyright (c) 2003 Jochen Kunz. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.30 2013/12/09 09:35:16 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.31 2014/02/24 07:23:43 skrll Exp $"); /* autoconfig and device stuff */ #include <sys/param.h> @@ -146,7 +146,7 @@ static void iee_cb_setup(struct iee_softc *, uint32_t); * sc->sc_cl_align must be set to 1 or to the cache line size. When set to * 1 no special alignment of DMA descriptors is done. If sc->sc_cl_align != 1 * it forces alignment of the data structures in the shared memory to a multiple - * of sc->sc_cl_align. This is needed on archs like hp700 that have non DMA + * of sc->sc_cl_align. This is needed on some hppa machines that have non DMA * I/O coherent caches and are unable to map the shared memory uncachable. * (At least pre PA7100LC CPUs are unable to map memory uncachable.) * @@ -172,7 +172,7 @@ static void iee_cb_setup(struct iee_softc *, uint32_t); * * The MD backend may call iee_detach() to detach the device. * - * See sys/arch/hp700/gsc/if_iee_gsc.c for an example. + * See sys/arch/hppa/gsc/if_iee_gsc.c for an example. */ diff --git a/sys/sys/bootblock.h b/sys/sys/bootblock.h index 1f8d7d7a872..c62d364b0a4 100644 --- a/sys/sys/bootblock.h +++ b/sys/sys/bootblock.h @@ -1,4 +1,4 @@ -/* $NetBSD: bootblock.h,v 1.55 2013/04/04 12:53:00 martin Exp $ */ +/* $NetBSD: bootblock.h,v 1.56 2014/02/24 07:23:44 skrll Exp $ */ /*- * Copyright (c) 2002-2004 The NetBSD Foundation, Inc. @@ -988,14 +988,14 @@ struct hp300_load { /* ------------------------------------------ - * hp700 + * hppa * */ /* * volume header for "LIF" format volumes */ -struct hp700_lifvol { +struct hppa_lifvol { uint16_t vol_id; uint8_t vol_label[6]; uint32_t vol_addr; @@ -1019,7 +1019,7 @@ struct hp700_lifvol { uint32_t vol_dummy2; }; -struct hp700_lifdir { +struct hppa_lifdir { uint8_t dir_name[10]; uint16_t dir_type; uint32_t dir_addr; @@ -1029,37 +1029,37 @@ struct hp700_lifdir { uint32_t dir_implement; }; -struct hp700_lifload { +struct hppa_lifload { int address; int count; }; -#define HP700_LIF_VOL_ID 0x8000 -#define HP700_LIF_VOL_OCT 0x1000 -#define HP700_LIF_DIR_SWAP 0x5243 -#define HP700_LIF_DIR_FS 0xcd38 -#define HP700_LIF_DIR_IOMAP 0xcd60 -#define HP700_LIF_DIR_HPUX 0xcd80 -#define HP700_LIF_DIR_ISL 0xce00 -#define HP700_LIF_DIR_PAD 0xcffe -#define HP700_LIF_DIR_AUTO 0xcfff -#define HP700_LIF_DIR_EST 0xd001 -#define HP700_LIF_DIR_TYPE 0xe942 - -#define HP700_LIF_DIR_FLAG 0x8001 /* dont ask me! */ -#define HP700_LIF_SECTSIZE 256 - -#define HP700_LIF_NUMDIR 8 - -#define HP700_LIF_VOLSTART 0 -#define HP700_LIF_VOLSIZE sizeof(struct hp700_lifvol) -#define HP700_LIF_DIRSTART 2048 -#define HP700_LIF_DIRSIZE (HP700_LIF_NUMDIR * sizeof(struct hp700_lifdir)) -#define HP700_LIF_FILESTART 4096 - -#define hp700_btolifs(b) (((b) + (HP700_LIF_SECTSIZE - 1)) / HP700_LIF_SECTSIZE) -#define hp700_lifstob(s) ((s) * HP700_LIF_SECTSIZE) -#define hp700_lifstodb(s) ((s) * HP700_LIF_SECTSIZE / DEV_BSIZE) +#define HPPA_LIF_VOL_ID 0x8000 +#define HPPA_LIF_VOL_OCT 0x1000 +#define HPPA_LIF_DIR_SWAP 0x5243 +#define HPPA_LIF_DIR_FS 0xcd38 +#define HPPA_LIF_DIR_IOMAP 0xcd60 +#define HPPA_LIF_DIR_HPUX 0xcd80 +#define HPPA_LIF_DIR_ISL 0xce00 +#define HPPA_LIF_DIR_PAD 0xcffe +#define HPPA_LIF_DIR_AUTO 0xcfff +#define HPPA_LIF_DIR_EST 0xd001 +#define HPPA_LIF_DIR_TYPE 0xe942 + +#define HPPA_LIF_DIR_FLAG 0x8001 /* dont ask me! */ +#define HPPA_LIF_SECTSIZE 256 + +#define HPPA_LIF_NUMDIR 8 + +#define HPPA_LIF_VOLSTART 0 +#define HPPA_LIF_VOLSIZE sizeof(struct hppa_lifvol) +#define HPPA_LIF_DIRSTART 2048 +#define HPPA_LIF_DIRSIZE (HPPA_LIF_NUMDIR * sizeof(struct hppa_lifdir)) +#define HPPA_LIF_FILESTART 4096 + +#define hppa_btolifs(b) (((b) + (HPPA_LIF_SECTSIZE - 1)) / HPPA_LIF_SECTSIZE) +#define hppa_lifstob(s) ((s) * HPPA_LIF_SECTSIZE) +#define hppa_lifstodb(s) ((s) * HPPA_LIF_SECTSIZE / DEV_BSIZE) /* ------------------------------------------ diff --git a/tools/Makefile b/tools/Makefile index 0e7b6bce2d2..ff31c84341a 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.170 2013/09/02 14:34:57 joerg Exp $ +# $NetBSD: Makefile,v 1.171 2014/02/24 07:23:44 skrll Exp $ .include <bsd.own.mk> .include <bsd.endian.mk> @@ -157,8 +157,8 @@ SUBDIR+= autoconf .WAIT gettext SUBDIR+= pigz .endif -.if ${MACHINE} == "hp700" -SUBDIR+= hp700-mkboot +.if ${MACHINE} == "hppa" +SUBDIR+= hppa-mkboot .endif .if ${MACHINE} == "ibmnws" diff --git a/tools/headerlist b/tools/headerlist index ae0742633e3..1f5a5aed854 100644 --- a/tools/headerlist +++ b/tools/headerlist @@ -1,4 +1,4 @@ -# $NetBSD: headerlist,v 1.8 2013/07/18 22:08:59 matt Exp $ +# $NetBSD: headerlist,v 1.9 2014/02/24 07:23:44 skrll Exp $ # # do not edit; this file was automatically generated by: # NetBSD: mkheaderlist.sh,v 1.1 2007/08/07 12:38:23 yamt Exp @@ -52,8 +52,6 @@ ./ews4800mips/include/elf_machdep.h ./hp300/include/disklabel.h ./hp300/include/elf_machdep.h -./hp700/include/disklabel.h -./hp700/include/elf_machdep.h ./hpc/stand/hpcboot/arm/elf_machdep.h ./hpc/stand/hpcboot/sh3/elf_machdep.h ./hpc/stand/hpcboot/mips/elf_machdep.h @@ -68,6 +66,7 @@ ./hpcmips/stand/include/mips/elf_machdep.h ./hpcsh/include/disklabel.h ./hpcsh/include/elf_machdep.h +./hppa/include/disklabel.h ./hppa/include/elf_machdep.h ./i386/include/disklabel.h ./i386/include/elf_machdep.h diff --git a/tools/hp700-mkboot/Makefile b/tools/hp700-mkboot/Makefile deleted file mode 100644 index fc8fdc4c82d..00000000000 --- a/tools/hp700-mkboot/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $NetBSD: Makefile,v 1.1 2004/07/28 09:17:31 skrll Exp $ - -HOSTPROGNAME= ${_TOOL_PREFIX}hp700-mkboot -HOST_SRCDIR= sys/arch/hp700/stand/mkboot - -HOST_CPPFLAGS+= -I${.CURDIR} - -.include "${.CURDIR}/../Makefile.host" diff --git a/tools/hppa-mkboot/Makefile b/tools/hppa-mkboot/Makefile new file mode 100644 index 00000000000..295b1158d48 --- /dev/null +++ b/tools/hppa-mkboot/Makefile @@ -0,0 +1,8 @@ +# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:44 skrll Exp $ + +HOSTPROGNAME= ${_TOOL_PREFIX}hppa-mkboot +HOST_SRCDIR= sys/arch/hppa/stand/mkboot + +HOST_CPPFLAGS+= -I${.CURDIR} + +.include "${.CURDIR}/../Makefile.host" diff --git a/usr.bin/calendar/calendars/calendar.netbsd b/usr.bin/calendar/calendars/calendar.netbsd index b4d24719531..ede14a49dbe 100644 --- a/usr.bin/calendar/calendars/calendar.netbsd +++ b/usr.bin/calendar/calendars/calendar.netbsd @@ -114,3 +114,4 @@ 12/23 NetBSD 1.3.3 released, 1998 12/23 NetBSD 3.0 released, 2005 12/29 NetBSD/ews4800mips port started, 2005 +02/24 NetBSD/hp700 port renamed NetBSD/hppa, 2014 diff --git a/usr.bin/make/Makefile.boot b/usr.bin/make/Makefile.boot index 953dba6a664..f5be09c6a71 100644 --- a/usr.bin/make/Makefile.boot +++ b/usr.bin/make/Makefile.boot @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.boot,v 1.20 2011/03/26 21:42:12 dholland Exp $ +# $NetBSD: Makefile.boot,v 1.21 2014/02/24 07:23:44 skrll Exp $ # # a very simple makefile... # @@ -14,7 +14,7 @@ CC=gcc -O -g MACHINE=i386 MACHINE_ARCH=i386 # tested on HP-UX 10.20 -#MAKE_MACHINE=hp700 +#MAKE_MACHINE=hppa #MAKE_MACHINE_ARCH=hppa CFLAGS= -DTARGET_MACHINE=\"${MACHINE}\" \ -DTARGET_MACHINE_ARCH=\"${MACHINE_ARCH}\" \ diff --git a/usr.sbin/crash/Makefile b/usr.sbin/crash/Makefile index bc5442a5ec6..125b9648c66 100644 --- a/usr.sbin/crash/Makefile +++ b/usr.sbin/crash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2013/03/04 20:10:50 christos Exp $ +# $NetBSD: Makefile,v 1.25 2014/02/24 07:23:44 skrll Exp $ PROG= crash MAN= crash.8 @@ -12,7 +12,7 @@ DPADD+= ${LIBUTIL} ${LIBKVM} ${LIBEDIT} ${LIBTERMINFO} # some ddb kernel components need limited modifications. for now, # punt if not noted as implemented here. .if ${MACHINE} == "amd64" \ - || ${MACHINE} == "hp700" \ + || ${MACHINE} == "hppa" \ || ${MACHINE} == "i386" \ || ${MACHINE} == "sparc64" \ || (${MACHINE_ARCH} == "arm" && ${MACHINE} != "acorn26") \ diff --git a/usr.sbin/installboot/Makefile b/usr.sbin/installboot/Makefile index be865cde19b..a3a012ede4b 100644 --- a/usr.sbin/installboot/Makefile +++ b/usr.sbin/installboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2012/08/10 12:10:28 joerg Exp $ +# $NetBSD: Makefile,v 1.48 2014/02/24 07:23:44 skrll Exp $ # .include <bsd.own.mk> @@ -12,7 +12,7 @@ ARCH_XLAT= amd64-i386.c news68k-news.c newsmips-news.c ARCH_XLAT+= sun2-sun68k.c sun3-sun68k.c .if !defined(SMALLPROG) && !defined(ARCH_FILES) -ARCH_FILES= alpha.c amiga.c emips.c ews4800mips.c hp300.c hp700.c i386.c +ARCH_FILES= alpha.c amiga.c emips.c ews4800mips.c hp300.c hppa.c i386.c ARCH_FILES+= landisk.c macppc.c news.c next68k.c pmax.c ARCH_FILES+= sparc.c sparc64.c sun68k.c vax.c x68k.c .else diff --git a/usr.sbin/installboot/arch/hp700.c b/usr.sbin/installboot/arch/hppa.c index 5e7f4de7b5a..d418c3c6b93 100644 --- a/usr.sbin/installboot/arch/hp700.c +++ b/usr.sbin/installboot/arch/hppa.c @@ -1,4 +1,4 @@ -/* $NetBSD: hp700.c,v 1.6 2013/06/14 03:54:43 msaitoh Exp $ */ +/* $NetBSD: hppa.c,v 1.1 2014/02/24 07:23:44 skrll Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #include <sys/cdefs.h> #if !defined(__lint) -__RCSID("$NetBSD: hp700.c,v 1.6 2013/06/14 03:54:43 msaitoh Exp $"); +__RCSID("$NetBSD: hppa.c,v 1.1 2014/02/24 07:23:44 skrll Exp $"); #endif /* !__lint */ /* We need the target disklabel.h, not the hosts one..... */ @@ -58,20 +58,20 @@ __RCSID("$NetBSD: hp700.c,v 1.6 2013/06/14 03:54:43 msaitoh Exp $"); #include "installboot.h" -#define HP700_LABELOFFSET 512 -#define HP700_LABELSIZE 404 /* reserve 16 partitions */ -#define HP700_BOOT_BLOCK_SIZE 8192 +#define HPPA_LABELOFFSET 512 +#define HPPA_LABELSIZE 404 /* reserve 16 partitions */ +#define HPPA_BOOT_BLOCK_SIZE 8192 -static int hp700_clearboot(ib_params *); -static int hp700_setboot(ib_params *); +static int hppa_clearboot(ib_params *); +static int hppa_setboot(ib_params *); -struct ib_mach ib_mach_hp700 = - { "hp700", hp700_setboot, hp700_clearboot, no_editboot, 0}; +struct ib_mach ib_mach_hppa = + { "hppa", hppa_setboot, hppa_clearboot, no_editboot, 0}; static int -hp700_clearboot(ib_params *params) +hppa_clearboot(ib_params *params) { - char bb[HP700_BOOT_BLOCK_SIZE]; + char bb[HPPA_BOOT_BLOCK_SIZE]; int retval, eol; ssize_t rv; @@ -92,8 +92,8 @@ hp700_clearboot(ib_params *params) } /* clear header */ - memset(bb, 0, HP700_LABELOFFSET); - eol = HP700_LABELOFFSET + HP700_LABELSIZE; + memset(bb, 0, HPPA_LABELOFFSET); + eol = HPPA_LABELOFFSET + HPPA_LABELSIZE; memset(&bb[eol], 0, sizeof bb - eol); if (params->flags & IB_VERBOSE) { @@ -109,7 +109,7 @@ hp700_clearboot(ib_params *params) if (rv == -1) { warn("Writing `%s'", params->filesystem); goto done; - } else if (rv != HP700_BOOT_BLOCK_SIZE) { + } else if (rv != HPPA_BOOT_BLOCK_SIZE) { warnx("Writing `%s': short write", params->filesystem); goto done; } else @@ -120,15 +120,15 @@ hp700_clearboot(ib_params *params) } static int -hp700_setboot(ib_params *params) +hppa_setboot(ib_params *params) { struct stat bootstrapsb; - char bb[HP700_BOOT_BLOCK_SIZE]; + char bb[HPPA_BOOT_BLOCK_SIZE]; struct { - char l_off[HP700_LABELOFFSET]; + char l_off[HPPA_LABELOFFSET]; struct disklabel l; - char l_pad[HP700_BOOT_BLOCK_SIZE - - HP700_LABELOFFSET - sizeof(struct disklabel)]; + char l_pad[HPPA_BOOT_BLOCK_SIZE + - HPPA_LABELOFFSET - sizeof(struct disklabel)]; } label; unsigned int secsize, npart; int retval; @@ -143,11 +143,11 @@ hp700_setboot(ib_params *params) retval = 0; /* read disklabel on the target disk */ - rv = pread(params->fsfd, &label, HP700_BOOT_BLOCK_SIZE, 0); + rv = pread(params->fsfd, &label, HPPA_BOOT_BLOCK_SIZE, 0); if (rv == -1) { warn("Reading `%s'", params->filesystem); goto done; - } else if (rv != HP700_BOOT_BLOCK_SIZE) { + } else if (rv != HPPA_BOOT_BLOCK_SIZE) { warnx("Reading `%s': short read", params->filesystem); goto done; } @@ -180,7 +180,7 @@ hp700_setboot(ib_params *params) ((unsigned)2*1024*1024*1024) / secsize) { warnx("Partition `a' of `%s' exceeds 2GB boundary.", params->filesystem); - warnx("It won't boot since hp700 PDC can handle only 2GB."); + warnx("It won't boot since hppa PDC can handle only 2GB."); goto done; } @@ -192,7 +192,7 @@ hp700_setboot(ib_params *params) goto done; } /* then, overwrite disklabel */ - memcpy(&bb[HP700_LABELOFFSET], &label.l, HP700_LABELSIZE); + memcpy(&bb[HPPA_LABELOFFSET], &label.l, HPPA_LABELSIZE); if (params->flags & IB_VERBOSE) { printf("Bootstrap start sector: %#x\n", 0); @@ -206,11 +206,11 @@ hp700_setboot(ib_params *params) } /* write boot loader and disklabel into the target disk */ - rv = pwrite(params->fsfd, &bb, HP700_BOOT_BLOCK_SIZE, 0); + rv = pwrite(params->fsfd, &bb, HPPA_BOOT_BLOCK_SIZE, 0); if (rv == -1) { warn("Writing `%s'", params->filesystem); goto done; - } else if (rv != HP700_BOOT_BLOCK_SIZE) { + } else if (rv != HPPA_BOOT_BLOCK_SIZE) { warnx("Writing `%s': short write", params->filesystem); goto done; } else diff --git a/usr.sbin/installboot/installboot.8 b/usr.sbin/installboot/installboot.8 index 04fd6ccc038..98d258d54ca 100644 --- a/usr.sbin/installboot/installboot.8 +++ b/usr.sbin/installboot/installboot.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: installboot.8,v 1.86 2012/03/10 19:38:16 wiz Exp $ +.\" $NetBSD: installboot.8,v 1.87 2014/02/24 07:23:44 skrll Exp $ .\" .\" Copyright (c) 2002-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -206,7 +206,7 @@ The following machines are currently supported by .Sy amiga , .Sy ews4800mips , .Sy hp300 , -.Sy hp700 , +.Sy hppa , .Sy i386 , .Sy landisk , .Sy macppc , @@ -530,12 +530,12 @@ is not found. . .El . -.Ss Nx Ns Tn /hp700 files +.Ss Nx Ns Tn /hppa files . .Bl -tag -width /usr/mdec/bootxx_ustarfs . .It Pa /usr/mdec/xxboot -.Nx Ns Tn /hp700 +.Nx Ns Tn /hppa primary bootstrap for .Sy FFSv1 , .Sy FFSv2 , @@ -543,7 +543,7 @@ primary bootstrap for and .Sy LFSv2 . .It Pa /usr/mdec/cdboot -.Nx Ns Tn /hp700 +.Nx Ns Tn /hppa primary bootstrap for ISO 9660 file system. .It Pa /usr/mdec/sdboot Synonym for diff --git a/usr.sbin/installboot/installboot.h b/usr.sbin/installboot/installboot.h index 00cb0c99959..680edb2710f 100644 --- a/usr.sbin/installboot/installboot.h +++ b/usr.sbin/installboot/installboot.h @@ -1,4 +1,4 @@ -/* $NetBSD: installboot.h,v 1.38 2011/06/14 05:35:08 matt Exp $ */ +/* $NetBSD: installboot.h,v 1.39 2014/02/24 07:23:44 skrll Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -167,7 +167,7 @@ extern struct ib_mach ib_mach_amd64; extern struct ib_mach ib_mach_amiga; extern struct ib_mach ib_mach_ews4800mips; extern struct ib_mach ib_mach_hp300; -extern struct ib_mach ib_mach_hp700; +extern struct ib_mach ib_mach_hppa; extern struct ib_mach ib_mach_i386; extern struct ib_mach ib_mach_landisk; extern struct ib_mach ib_mach_macppc; diff --git a/usr.sbin/installboot/machines.c b/usr.sbin/installboot/machines.c index 9320b0afe33..357652b83b7 100644 --- a/usr.sbin/installboot/machines.c +++ b/usr.sbin/installboot/machines.c @@ -1,4 +1,4 @@ -/* $NetBSD: machines.c,v 1.38 2011/06/14 05:35:08 matt Exp $ */ +/* $NetBSD: machines.c,v 1.39 2014/02/24 07:23:44 skrll Exp $ */ /*- * Copyright (c) 2002-2005 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #include <sys/cdefs.h> #if !defined(__lint) -__RCSID("$NetBSD: machines.c,v 1.38 2011/06/14 05:35:08 matt Exp $"); +__RCSID("$NetBSD: machines.c,v 1.39 2014/02/24 07:23:44 skrll Exp $"); #endif /* !__lint */ #include <sys/types.h> @@ -53,7 +53,7 @@ struct ib_mach ib_mach_emips, ib_mach_ews4800mips, ib_mach_hp300, - ib_mach_hp700, + ib_mach_hppa, ib_mach_i386, ib_mach_landisk, ib_mach_macppc, @@ -75,7 +75,7 @@ struct ib_mach * const machines[] = { &ib_mach_emips, &ib_mach_ews4800mips, &ib_mach_hp300, - &ib_mach_hp700, + &ib_mach_hppa, &ib_mach_i386, &ib_mach_landisk, &ib_mach_macppc, diff --git a/usr.sbin/rbootd/rbootd.8 b/usr.sbin/rbootd/rbootd.8 index bce8862da9a..0b0c9aae7ba 100644 --- a/usr.sbin/rbootd/rbootd.8 +++ b/usr.sbin/rbootd/rbootd.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: rbootd.8,v 1.12 2011/12/15 16:45:21 tsutsui Exp $ +.\" $NetBSD: rbootd.8,v 1.13 2014/02/24 07:23:44 skrll Exp $ .\" .\" Copyright (c) 1988, 1992 The University of Utah and the Center .\" for Software Science (CSS). @@ -62,7 +62,7 @@ stripped away before processing. By default, .Nm only responds to requests from machines listed in its configuration file. -If the client doesn't supply a file name (HP700 series machines don't), the first one listed for this machine will be supplied. +If the client doesn't supply a file name (HPPA series machines don't), the first one listed for this machine will be supplied. .Pp The options are as follows: .Bl -tag -width Fl |
