Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/thorpej-devvp]: src/sys Catch up with -current. Fix some bogons in the s...



details:   https://anonhg.NetBSD.org/src/rev/35d1159f80c0
branches:  thorpej-devvp
changeset: 514629:35d1159f80c0
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Thu Oct 11 00:01:39 2001 +0000

description:
Catch up with -current. Fix some bogons in the sparc64 kbd/ms
attach code. cd18xx conversion provided by mrg.

diffstat:

 sys/adosfs/advfsops.c                          |     7 +-
 sys/arch/algor/algor/conf.c                    |     5 +-
 sys/arch/alpha/conf/ALPHA                      |     5 +-
 sys/arch/alpha/conf/GENERIC                    |     5 +-
 sys/arch/alpha/conf/files.alpha                |     7 +-
 sys/arch/alpha/include/Makefile.inc            |     7 +-
 sys/arch/alpha/pci/irongate.c                  |     5 +-
 sys/arch/amiga/dev/aucc.c                      |     5 +-
 sys/arch/amiga/dev/repulse.c                   |     4 +-
 sys/arch/amiga/dev/siop2.c                     |     4 +-
 sys/arch/amiga/dev/siop2_script.out            |   196 +-
 sys/arch/amiga/dev/siop2_script.ss             |     5 +-
 sys/arch/arm26/include/Makefile                |     4 +-
 sys/arch/arm26/include/param.h                 |     4 +-
 sys/arch/arm32/shark/ns87307reg.h              |     4 +-
 sys/arch/arm32/vidc/lmcaudio.c                 |     5 +-
 sys/arch/arm32/vidc/vidcaudio.c                |     5 +-
 sys/arch/atari/stand/libsa/Makefile            |     4 +-
 sys/arch/dnard/include/asm.h                   |     3 +
 sys/arch/hp300/stand/uboot/uboot.c             |     4 +-
 sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c     |    19 +-
 sys/arch/hpcsh/dev/hd64461/hd64461pcmciareg.h  |     6 +-
 sys/arch/i386/conf/GENERIC                     |     6 +-
 sys/arch/i386/i386/apm.c                       |     4 +-
 sys/arch/i386/stand/installboot/Makefile       |     5 +-
 sys/arch/m68k/fpsp/Makefile                    |    20 +-
 sys/arch/m68k/fpsp/Makefile.inc                |    15 +-
 sys/arch/m68k/fpsp/netbsd.sa                   |     4 +-
 sys/arch/macppc/dev/akbd.c                     |     4 +-
 sys/arch/macppc/dev/awacs.c                    |     3 +-
 sys/arch/mips/conf/Makefile.mips               |    27 +-
 sys/arch/mips/conf/kern.ldscript               |    64 +
 sys/arch/mips/conf/kern.ldscript.be            |    66 -
 sys/arch/mips/conf/kern.ldscript.le            |    66 -
 sys/arch/mips/conf/stand.ldscript              |    41 +
 sys/arch/mips/conf/stand.ldscript.be           |    43 -
 sys/arch/mips/conf/stand.ldscript.le           |    43 -
 sys/arch/mips/include/Makefile.inc             |     7 +
 sys/arch/mipsco/stand/Makefile.booters         |     9 +-
 sys/arch/mvme68k/stand/libsa/Makefile          |     4 +-
 sys/arch/newsmips/apbus/spifi.c                |     6 +-
 sys/arch/ofppc/ofppc/soft_spl.c                |     8 +-
 sys/arch/pmax/conf/files.pmax                  |    12 +-
 sys/arch/pmax/ibus/if_le_ibus.c                |   172 ++
 sys/arch/pmax/stand/Makefile.booters           |    12 +-
 sys/arch/pmax/tc/asc_pmaz.c                    |   368 -----
 sys/arch/prep/isa/paud_isa.c                   |     3 +-
 sys/arch/sgimips/conf/Makefile.sgimips.inc     |     6 +-
 sys/arch/sgimips/dev/com_mace.c                |    19 +-
 sys/arch/sparc/dev/am7930_sparc.c              |     5 +-
 sys/arch/sparc/dev/audioamd.c                  |     5 +-
 sys/arch/sparc/dev/kd.c                        |    16 +-
 sys/arch/sparc/dev/sbus.c                      |     6 +-
 sys/arch/sparc/sparc/autoconf.c                |    19 +-
 sys/arch/sparc/sparc/conf.c                    |    10 +-
 sys/arch/sparc/sparc/cpu.c                     |     6 +-
 sys/arch/sparc/sparc/iommu.c                   |     8 +-
 sys/arch/sparc/sparc/machdep.c                 |    47 +-
 sys/arch/sparc64/dev/com_ebus.c                |    41 +-
 sys/arch/sparc64/dev/iommu.c                   |   131 +-
 sys/arch/sparc64/dev/iommuvar.h                |     6 +-
 sys/arch/sparc64/dev/kd.c                      |    16 +-
 sys/arch/sparc64/dev/pcons.c                   |     3 +-
 sys/arch/sparc64/dev/psycho.c                  |    30 +-
 sys/arch/sparc64/dev/sbus.c                    |     5 +-
 sys/arch/sparc64/dev/simbareg.h                |    74 -
 sys/arch/sparc64/dev/zs.c                      |     8 +-
 sys/arch/sparc64/include/autoconf.h            |     3 +-
 sys/arch/sparc64/include/int_fmtio.h           |    38 +-
 sys/arch/sparc64/include/openfirm.h            |     4 +-
 sys/arch/sparc64/sparc64/autoconf.c            |    40 +-
 sys/arch/sparc64/sparc64/clock.c               |     7 +-
 sys/arch/sparc64/sparc64/conf.c                |     5 +-
 sys/arch/sparc64/sparc64/genassym.c            |     3 +-
 sys/arch/sparc64/sparc64/genassym.cf           |     4 +-
 sys/arch/sparc64/sparc64/openfirm.c            |    39 +-
 sys/arch/sun2/dev/if_ie_obio.c                 |     4 +-
 sys/arch/sun2/include/promlib.h                |     3 +-
 sys/arch/sun2/sun2/promlib.c                   |     3 +-
 sys/arch/sun3/conf/RAMDISK                     |     4 +-
 sys/arch/sun3/conf/RAMDISK3X                   |     4 +-
 sys/arch/sun3/dev/kd.c                         |    16 +-
 sys/arch/sun3/stand/Makefile.inc               |     6 +-
 sys/arch/sun3/stand/libsa/Makefile             |    16 +-
 sys/arch/sun68k/stand/libsa/Makefile           |     4 +-
 sys/arch/x68k/dev/vs.c                         |     4 +-
 sys/compat/linux/arch/mips/linux_machdep.c     |    29 +-
 sys/compat/linux/arch/mips/linux_syscall.h     |    52 +-
 sys/compat/linux/arch/mips/linux_syscallargs.h |    20 +-
 sys/compat/linux/arch/mips/linux_syscalls.c    |    39 +-
 sys/compat/linux/arch/mips/linux_sysent.c      |    71 +-
 sys/compat/linux/arch/mips/linux_types.h       |     4 +-
 sys/compat/linux/arch/mips/syscalls.master     |    54 +-
 sys/compat/linux/common/linux_file64.c         |     2 +-
 sys/conf/files                                 |     7 +-
 sys/dev/DEVNAMES                               |    11 +-
 sys/dev/Makefile                               |     6 +-
 sys/dev/auconv.c                               |    62 +-
 sys/dev/auconv.h                               |    26 +-
 sys/dev/audio.c                                |   405 ++----
 sys/dev/audio_if.h                             |    72 +-
 sys/dev/hpc/hpckbdkeymap.h                     |     4 +-
 sys/dev/ic/cd18xx.c                            |  1572 ++++++++++++++++++++++++
 sys/dev/ic/cd18xxreg.h                         |   298 ++++
 sys/dev/ic/cd18xxvar.h                         |   180 ++
 sys/dev/ic/cs4231.c                            |     5 +-
 sys/dev/ic/elinkxl.c                           |    14 +-
 sys/dev/ic/gem.c                               |   138 +-
 sys/dev/ic/gemvar.h                            |    31 +-
 sys/dev/ic/hme.c                               |     5 +-
 sys/dev/ic/isp.c                               |    61 +-
 sys/dev/ic/ispmbox.h                           |    70 +-
 sys/dev/ic/ispvar.h                            |     6 +-
 sys/dev/ic/smc91cxx.c                          |     8 +-
 sys/dev/ic/tms320av110.c                       |     5 +-
 sys/dev/ic/z8530tty.c                          |     4 +-
 sys/dev/isa/aria.c                             |     5 +-
 sys/dev/isa/ess.c                              |     4 +-
 sys/dev/isa/gus.c                              |     8 +-
 sys/dev/isa/pas.c                              |     3 +-
 sys/dev/isa/pss.c                              |     3 +-
 sys/dev/isa/sb.c                               |     3 +-
 sys/dev/isa/wss.c                              |     3 +-
 sys/dev/isa/ym.c                               |     3 +-
 sys/dev/isapnp/gus_isapnp.c                    |     5 +-
 sys/dev/midi.c                                 |   129 +-
 sys/dev/midi_if.h                              |    30 +-
 sys/dev/midisyn.c                              |    77 +-
 sys/dev/midisynvar.h                           |    28 +-
 sys/dev/mulaw.c                                |    84 +-
 sys/dev/mulaw.h                                |    34 +-
 sys/dev/pci/agp.c                              |    16 +-
 sys/dev/pci/agp_amd.c                          |    10 +-
 sys/dev/pci/agpvar.h                           |     5 +-
 sys/dev/pci/auich.c                            |     3 +-
 sys/dev/pci/auvia.c                            |     3 +-
 sys/dev/pci/cmpci.c                            |     5 +-
 sys/dev/pci/cs4280.c                           |     3 +-
 sys/dev/pci/cs4281.c                           |     3 +-
 sys/dev/pci/eap.c                              |     4 +-
 sys/dev/pci/esm.c                              |     5 +-
 sys/dev/pci/eso.c                              |     5 +-
 sys/dev/pci/fms.c                              |     3 +-
 sys/dev/pci/if_hme_pci.c                       |    91 +-
 sys/dev/pci/if_stge.c                          |    10 +-
 sys/dev/pci/isp_pci.c                          |     6 +-
 sys/dev/pci/neo.c                              |     3 +-
 sys/dev/pci/pcidevs                            |    11 +-
 sys/dev/pci/pcidevs.h                          |     7 +-
 sys/dev/pci/pcidevs_data.h                     |    12 +-
 sys/dev/pci/sv.c                               |     3 +-
 sys/dev/pci/twe.c                              |    55 +-
 sys/dev/pci/twevar.h                           |    11 +-
 sys/dev/pci/yds.c                              |     3 +-
 sys/dev/pcmcia/esl.c                           |     5 +-
 sys/dev/pcmcia/pcmciadevs                      |   310 ++--
 sys/dev/pcmcia/pcmciadevs.h                    |   626 ++++----
 sys/dev/pcmcia/pcmciadevs_data.h               |  1212 +++++++++---------
 sys/dev/raidframe/Makefile                     |     8 +
 sys/dev/raidframe/raidframeio.h                |   135 ++
 sys/dev/raidframe/raidframevar.h               |   570 ++++++++
 sys/dev/raidframe/rf_acctrace.c                |     8 +-
 sys/dev/raidframe/rf_acctrace.h                |     4 +-
 sys/dev/raidframe/rf_alloclist.c               |     6 +-
 sys/dev/raidframe/rf_alloclist.h               |     4 +-
 sys/dev/raidframe/rf_aselect.c                 |     4 +-
 sys/dev/raidframe/rf_callback.c                |     5 +-
 sys/dev/raidframe/rf_callback.h                |     4 +-
 sys/dev/raidframe/rf_chaindecluster.c          |     5 +-
 sys/dev/raidframe/rf_configure.h               |    93 -
 sys/dev/raidframe/rf_copyback.c                |    18 +-
 sys/dev/raidframe/rf_copyback.h                |     4 +-
 sys/dev/raidframe/rf_cvscan.c                  |     4 +-
 sys/dev/raidframe/rf_dag.h                     |     5 +-
 sys/dev/raidframe/rf_dagdegrd.c                |     5 +-
 sys/dev/raidframe/rf_dagdegrd.h                |     4 +-
 sys/dev/raidframe/rf_dagdegwr.c                |     5 +-
 sys/dev/raidframe/rf_dagffrd.c                 |     5 +-
 sys/dev/raidframe/rf_dagffrd.h                 |     4 +-
 sys/dev/raidframe/rf_dagffwr.c                 |     5 +-
 sys/dev/raidframe/rf_dagffwr.h                 |     4 +-
 sys/dev/raidframe/rf_dagutils.c                |     5 +-
 sys/dev/raidframe/rf_dagutils.h                |     5 +-
 sys/dev/raidframe/rf_debugMem.c                |     4 +-
 sys/dev/raidframe/rf_debugMem.h                |     5 +-
 sys/dev/raidframe/rf_debugprint.c              |     5 +-
 sys/dev/raidframe/rf_decluster.c               |     7 +-
 sys/dev/raidframe/rf_decluster.h               |    10 +-
 sys/dev/raidframe/rf_declusterPQ.c             |     6 +-
 sys/dev/raidframe/rf_declusterPQ.h             |     4 +-
 sys/dev/raidframe/rf_desc.h                    |     5 +-
 sys/dev/raidframe/rf_diskqueue.c               |     6 +-
 sys/dev/raidframe/rf_diskqueue.h               |     5 +-
 sys/dev/raidframe/rf_disks.c                   |    10 +-
 sys/dev/raidframe/rf_disks.h                   |    44 +-
 sys/dev/raidframe/rf_driver.c                  |     6 +-
 sys/dev/raidframe/rf_driver.h                  |     8 +-
 sys/dev/raidframe/rf_etimer.h                  |     9 +-
 sys/dev/raidframe/rf_evenodd.c                 |     6 +-
 sys/dev/raidframe/rf_evenodd_dagfuncs.c        |     6 +-
 sys/dev/raidframe/rf_evenodd_dags.c            |     5 +-
 sys/dev/raidframe/rf_evenodd_dags.h            |     4 +-
 sys/dev/raidframe/rf_fifo.c                    |     6 +-
 sys/dev/raidframe/rf_fifo.h                    |     5 +-
 sys/dev/raidframe/rf_freelist.h                |     5 +-
 sys/dev/raidframe/rf_general.h                 |    10 +-
 sys/dev/raidframe/rf_hist.h                    |     4 +-
 sys/dev/raidframe/rf_interdecluster.c          |     5 +-
 sys/dev/raidframe/rf_kintf.h                   |     4 +-
 sys/dev/raidframe/rf_layout.c                  |     6 +-
 sys/dev/raidframe/rf_layout.h                  |   102 +-
 sys/dev/raidframe/rf_map.c                     |    10 +-
 sys/dev/raidframe/rf_map.h                     |     5 +-
 sys/dev/raidframe/rf_mcpair.c                  |     5 +-
 sys/dev/raidframe/rf_mcpair.h                  |     4 +-
 sys/dev/raidframe/rf_memchunk.c                |     5 +-
 sys/dev/raidframe/rf_memchunk.h                |     4 +-
 sys/dev/raidframe/rf_netbsd.h                  |    64 +-
 sys/dev/raidframe/rf_netbsdkintf.c             |    11 +-
 sys/dev/raidframe/rf_nwayxor.h                 |     5 +-
 sys/dev/raidframe/rf_options.c                 |     4 +-
 sys/dev/raidframe/rf_paritylog.c               |     5 +-
 sys/dev/raidframe/rf_paritylog.h               |     4 +-
 sys/dev/raidframe/rf_paritylogDiskMgr.c        |     5 +-
 sys/dev/raidframe/rf_paritylogDiskMgr.h        |     4 +-
 sys/dev/raidframe/rf_paritylogging.c           |     5 +-
 sys/dev/raidframe/rf_parityloggingdags.c       |     5 +-
 sys/dev/raidframe/rf_parityscan.c              |     5 +-
 sys/dev/raidframe/rf_parityscan.h              |     5 +-
 sys/dev/raidframe/rf_pq.c                      |     5 +-
 sys/dev/raidframe/rf_pqdeg.c                   |     5 +-
 sys/dev/raidframe/rf_pqdeg.h                   |     6 +-
 sys/dev/raidframe/rf_pqdegdags.c               |     5 +-
 sys/dev/raidframe/rf_psstatus.c                |     5 +-
 sys/dev/raidframe/rf_psstatus.h                |     5 +-
 sys/dev/raidframe/rf_raid.h                    |     6 +-
 sys/dev/raidframe/rf_raid0.c                   |     6 +-
 sys/dev/raidframe/rf_raid1.h                   |     4 +-
 sys/dev/raidframe/rf_raid5.c                   |     5 +-
 sys/dev/raidframe/rf_raidframe.h               |   148 --
 sys/dev/raidframe/rf_reconbuffer.h             |     5 +-
 sys/dev/raidframe/rf_reconmap.h                |     5 +-
 sys/dev/raidframe/rf_reconstruct.c             |     5 +-
 sys/dev/raidframe/rf_reconstruct.h             |     4 +-
 sys/dev/raidframe/rf_reconutil.c               |     5 +-
 sys/dev/raidframe/rf_reconutil.h               |     5 +-
 sys/dev/raidframe/rf_revent.h                  |     4 +-
 sys/dev/raidframe/rf_shutdown.c                |     5 +-
 sys/dev/raidframe/rf_shutdown.h                |     5 +-
 sys/dev/raidframe/rf_sstf.c                    |     4 +-
 sys/dev/raidframe/rf_states.h                  |     4 +-
 sys/dev/raidframe/rf_stripelocks.c             |    13 +-
 sys/dev/raidframe/rf_stripelocks.h             |     4 +-
 sys/dev/raidframe/rf_threadstuff.c             |     5 +-
 sys/dev/raidframe/rf_threadstuff.h             |     7 +-
 sys/dev/raidframe/rf_types.h                   |   232 ---
 sys/dev/raidframe/rf_utils.h                   |     4 +-
 sys/dev/rcons/files.rcons                      |     6 +-
 sys/dev/sbus/bwtwo_sbus.c                      |     4 +-
 sys/dev/sbus/cgthree_sbus.c                    |     4 +-
 sys/dev/sbus/files.sbus                        |     8 +-
 sys/dev/sbus/if_hme_sbus.c                     |    16 +-
 sys/dev/sbus/sio16.c                           |   316 ++++
 sys/dev/sun/kbd.c                              |    26 +-
 sys/dev/sun/kbdvar.h                           |    18 +-
 sys/dev/sun/ms.c                               |     6 +-
 sys/dev/sun/msvar.h                            |    11 +-
 sys/dev/sun/sunkbd.c                           |    32 +-
 sys/dev/sun/sunms.c                            |    43 +-
 sys/dev/tc/asc_tc.c                            |   368 +++++
 sys/dev/tc/bba.c                               |     5 +-
 sys/dev/tc/files.tc                            |    16 +-
 sys/dev/tc/if_le_ibus.c                        |   172 --
 sys/dev/usb/if_aue.c                           |    12 +-
 sys/dev/usb/if_auereg.h                        |     4 +-
 sys/dev/usb/if_kue.c                           |    16 +-
 sys/dev/usb/uaudio.c                           |     3 +-
 sys/dev/usb/uhci.c                             |    12 +-
 sys/dev/usb/usbdevs                            |    40 +-
 sys/dev/usb/usbdevs.h                          |    42 +-
 sys/dev/usb/usbdevs_data.h                     |   144 ++-
 sys/dev/usb/uscanner.c                         |     4 +-
 sys/dev/wscons/files.wscons                    |     6 +-
 sys/dev/wscons/wsconsio.h                      |     3 +-
 sys/filecorefs/filecore_vfsops.c               |     7 +-
 sys/kern/subr_pool.c                           |    66 +-
 sys/kern/subr_prop.c                           |   661 ++++++++++
 sys/kern/sys_pipe.c                            |     4 +-
 sys/kern/vfs_subr.c                            |     4 +-
 sys/lkm/exec/Makefile                          |     6 +-
 sys/miscfs/genfs/genfs_vnops.c                 |     5 +-
 sys/net/Makefile                               |     4 +-
 sys/net/netisr.h                               |     9 +-
 sys/net/netisr_dispatch.h                      |     5 +-
 sys/nfs/nfs_vfsops.c                           |     6 +-
 sys/sys/Makefile                               |     5 +-
 sys/sys/malloc.h                               |     8 +-
 sys/sys/mbuf.h                                 |     4 +-
 sys/sys/pool.h                                 |     3 +-
 sys/sys/properties.h                           |    66 +
 sys/sys/sysctl.h                               |     2 +-
 sys/ufs/ufs/ufs_inode.c                        |    10 +-
 sys/ufs/ufs/ufs_readwrite.c                    |     6 +-
 sys/uvm/uvm_fault.c                            |     4 +-
 sys/uvm/uvm_map.h                              |     6 +-
 305 files changed, 7723 insertions(+), 4500 deletions(-)

diffs (truncated from 20030 to 300 lines):

diff -r db398cd66031 -r 35d1159f80c0 sys/adosfs/advfsops.c
--- a/sys/adosfs/advfsops.c     Wed Oct 10 11:55:46 2001 +0000
+++ b/sys/adosfs/advfsops.c     Thu Oct 11 00:01:39 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: advfsops.c,v 1.46.4.4 2001/10/10 11:55:46 fvdl Exp $   */
+/*     $NetBSD: advfsops.c,v 1.46.4.5 2001/10/11 00:01:39 fvdl Exp $   */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -78,6 +78,10 @@
 
 struct pool adosfs_node_pool;
 
+struct genfs_ops adosfs_genfsops = {
+       genfs_size,
+};
+
 int
 adosfs_mount(mp, path, data, ndp, p)
        struct mount *mp;
@@ -590,6 +594,7 @@
        ap->mtime.mins = adoswordn(bp, ap->nwords - 22);
        ap->mtime.ticks = adoswordn(bp, ap->nwords - 21);
 
+       genfs_node_init(vp, &adosfs_genfsops);
        *vpp = vp;
        brelse(bp);
        vp->v_size = ap->fsize;
diff -r db398cd66031 -r 35d1159f80c0 sys/arch/algor/algor/conf.c
--- a/sys/arch/algor/algor/conf.c       Wed Oct 10 11:55:46 2001 +0000
+++ b/sys/arch/algor/algor/conf.c       Thu Oct 11 00:01:39 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.1 2001/05/28 16:22:15 thorpej Exp $ */
+/*     $NetBSD: conf.c,v 1.1.4.1 2001/10/11 00:01:40 fvdl Exp $        */
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.1 2001/05/28 16:22:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.1.4.1 2001/10/11 00:01:40 fvdl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,7 +46,6 @@
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/vnode.h>
-#include <sys/conf.h>
 
 #include "fdc.h"
 bdev_decl(fd);
diff -r db398cd66031 -r 35d1159f80c0 sys/arch/alpha/conf/ALPHA
--- a/sys/arch/alpha/conf/ALPHA Wed Oct 10 11:55:46 2001 +0000
+++ b/sys/arch/alpha/conf/ALPHA Thu Oct 11 00:01:39 2001 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: ALPHA,v 1.152.4.1 2001/10/01 12:36:58 fvdl Exp $
+# $NetBSD: ALPHA,v 1.152.4.2 2001/10/11 00:01:40 fvdl Exp $
 #
 # Alpha kernel with all the options you'd want, and more.
 
 include        "arch/alpha/conf/std.alpha"
 
-ident          "ALPHA-$Revision: 1.152.4.1 $"
+ident          "ALPHA-$Revision: 1.152.4.2 $"
 
 maxusers 32
 
@@ -193,6 +193,7 @@
 audio* at      bba?
 tcds*  at      tc? slot ? offset ?
 asc*   at      tcds? chip ?
+asc*   at      tc? slot ? offset ?
 #cfb*  at      tc? slot ? offset ?
 #sfb*  at      tc? slot ? offset ?
 le*    at      tc? slot ? offset ?
diff -r db398cd66031 -r 35d1159f80c0 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Wed Oct 10 11:55:46 2001 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Thu Oct 11 00:01:39 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.192.2.1 2001/10/01 12:36:59 fvdl Exp $
+# $NetBSD: GENERIC,v 1.192.2.2 2001/10/11 00:01:40 fvdl Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
 #
@@ -6,7 +6,7 @@
 
 include        "arch/alpha/conf/std.alpha"
 
-#ident                 "GENERIC-$Revision: 1.192.2.1 $"
+#ident                 "GENERIC-$Revision: 1.192.2.2 $"
 
 maxusers 32
 
@@ -177,6 +177,7 @@
 audio* at      bba?
 tcds*  at      tc? slot ? offset ?
 asc*   at      tcds? chip ?
+asc*   at      tc? slot ? offset ?
 #cfb*  at      tc? slot ? offset ?
 #sfb*  at      tc? slot ? offset ?
 le*    at      tc? slot ? offset ?
diff -r db398cd66031 -r 35d1159f80c0 sys/arch/alpha/conf/files.alpha
--- a/sys/arch/alpha/conf/files.alpha   Wed Oct 10 11:55:46 2001 +0000
+++ b/sys/arch/alpha/conf/files.alpha   Thu Oct 11 00:01:39 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.142.4.1 2001/10/01 12:37:00 fvdl Exp $
+# $NetBSD: files.alpha,v 1.142.4.2 2001/10/11 00:01:41 fvdl Exp $
 #
 # alpha-specific configuration info
 
@@ -228,11 +228,6 @@
 attach lkkbd at zsc with zskbd
 file   dev/tc/zskbd.c                  zskbd           needs-flag
 
-# 53C[F]90 SCSI
-device asc: scsi, ncr53c9x
-attach asc at tcds with asc_tcds
-file   dev/tc/asc_tcds.c               asc_tcds
-
 # TC and baseboard ioasic Lance ethernet are in files.tc
 
 #
diff -r db398cd66031 -r 35d1159f80c0 sys/arch/alpha/include/Makefile.inc
--- a/sys/arch/alpha/include/Makefile.inc       Wed Oct 10 11:55:46 2001 +0000
+++ b/sys/arch/alpha/include/Makefile.inc       Thu Oct 11 00:01:39 2001 +0000
@@ -1,3 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.1 1999/03/10 06:41:48 ross Exp $
+# $NetBSD: Makefile.inc,v 1.1.24.1 2001/10/11 00:01:41 fvdl Exp $
+
+.if !defined(_ALPHA_MAKEFILE_INC)
+_ALPHA_MAKEFILE_INC=   yes
 
 CFLAGS += -mno-fp-regs
+
+.endif
diff -r db398cd66031 -r 35d1159f80c0 sys/arch/alpha/pci/irongate.c
--- a/sys/arch/alpha/pci/irongate.c     Wed Oct 10 11:55:46 2001 +0000
+++ b/sys/arch/alpha/pci/irongate.c     Thu Oct 11 00:01:39 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate.c,v 1.3.6.1 2001/10/01 12:37:04 fvdl Exp $ */
+/* $NetBSD: irongate.c,v 1.3.6.2 2001/10/11 00:01:41 fvdl Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: irongate.c,v 1.3.6.1 2001/10/01 12:37:04 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irongate.c,v 1.3.6.2 2001/10/11 00:01:41 fvdl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -194,6 +194,7 @@
                apa.apa_busname = "agp";
                apa.apa_pci_args.pa_iot = pba.pba_iot;
                apa.apa_pci_args.pa_memt = pba.pba_memt;
+               apa.apa_pci_args.pa_dmat = pba.pba_dmat;
                apa.apa_pci_args.pa_pc = pba.pba_pc;
                apa.apa_pci_args.pa_bus = pba.pba_bus;
                apa.apa_pci_args.pa_device = IRONGATE_PCIHOST_DEV;
diff -r db398cd66031 -r 35d1159f80c0 sys/arch/amiga/dev/aucc.c
--- a/sys/arch/amiga/dev/aucc.c Wed Oct 10 11:55:46 2001 +0000
+++ b/sys/arch/amiga/dev/aucc.c Thu Oct 11 00:01:39 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aucc.c,v 1.27 2001/05/08 06:09:30 is Exp $     */
+/*     $NetBSD: aucc.c,v 1.27.4.1 2001/10/11 00:01:42 fvdl Exp $       */
 
 /*
  * Copyright (c) 1999 Bernardo Innocenti
@@ -261,6 +261,9 @@
        NULL,
        NULL,
        aucc_get_props,
+       NULL,
+       NULL,
+       NULL,
 };
 
 /* autoconfig routines */
diff -r db398cd66031 -r 35d1159f80c0 sys/arch/amiga/dev/repulse.c
--- a/sys/arch/amiga/dev/repulse.c      Wed Oct 10 11:55:46 2001 +0000
+++ b/sys/arch/amiga/dev/repulse.c      Thu Oct 11 00:01:39 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: repulse.c,v 1.1 2001/08/25 21:15:44 is Exp $ */
+/* $NetBSD: repulse.c,v 1.1.2.1 2001/10/11 00:01:42 fvdl Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -128,7 +128,7 @@
        rep_get_props,
        /* trigger_output */ 0,
        /* trigger_input */ 0,
-
+       /* dev_ioctl */ 0,
 };
 
 /* hardware registers */
diff -r db398cd66031 -r 35d1159f80c0 sys/arch/amiga/dev/siop2.c
--- a/sys/arch/amiga/dev/siop2.c        Wed Oct 10 11:55:46 2001 +0000
+++ b/sys/arch/amiga/dev/siop2.c        Thu Oct 11 00:01:39 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: siop2.c,v 1.15 2001/04/25 17:53:09 bouyer Exp $        */
+/*     $NetBSD: siop2.c,v 1.15.4.1 2001/10/11 00:01:42 fvdl Exp $      */
 
 /*
  * Copyright (c) 1994,1998 Michael L. Hitch
@@ -91,7 +91,7 @@
 void siopng_dump_acb __P((struct siop_acb *));
 
 /* 53C720/770 script */
-const
+
 #include <amiga/dev/siop2_script.out>
 
 /* default to not inhibit sync negotiation on any drive */
diff -r db398cd66031 -r 35d1159f80c0 sys/arch/amiga/dev/siop2_script.out
--- a/sys/arch/amiga/dev/siop2_script.out       Wed Oct 10 11:55:46 2001 +0000
+++ b/sys/arch/amiga/dev/siop2_script.out       Thu Oct 11 00:01:39 2001 +0000
@@ -1,111 +1,114 @@
-/*     $NetBSD: siop2_script.out,v 1.2 1999/03/26 22:50:23 mhitch Exp $        */
+/*     $NetBSD: siop2_script.out,v 1.2.20.1 2001/10/11 00:01:42 fvdl Exp $     */
 /*
  *     DO NOT EDIT - this file is automatically generated.
- *     created from ../../dev/siop2_script.ss on Sat Mar 20 20:44:20 1999
+ *     created from siop2_script.ss on Mon Oct  8 22:51:52 2001
  */
-unsigned long siopng_scripts[] = {
-       0x47000000, 0x00000140,                 /* 000 -   0 */
-       0x878b0000, 0x00000030,                 /* 008 -   8 */
-       0x868a0000, 0x00000190,                 /* 010 -  16 */
-       0x828a0000, 0x00000198,                 /* 018 -  24 */
-       0x808a0000, 0x000001a8,                 /* 020 -  32 */
-       0x818a0000, 0x00000230,                 /* 028 -  40 */
-       0x838a0000, 0x000002b8,                 /* 030 -  48 */
-       0x98080000, 0x0000ff05,                 /* 038 -  56 */
-       0x1f000024, 0x00000024,                 /* 040 -  64 */
-       0x808c0001, 0x00000040,                 /* 048 -  72 */
-       0x808c0004, 0x00000090,                 /* 050 -  80 */
-       0x808c0002, 0x000000a8,                 /* 058 -  88 */
-       0x808c0007, 0x00000010,                 /* 060 -  96 */
-       0x808c0003, 0x00000008,                 /* 068 - 104 */
-       0x98080000, 0x0000ff06,                 /* 070 - 112 */
-       0x60000040, 0x00000000,                 /* 078 - 120 */
-       0x60000008, 0x00000000,                 /* 080 - 128 */
-       0x80880000, 0xffffff78,                 /* 088 - 136 */
-       0x60000040, 0x00000000,                 /* 090 - 144 */
-       0x1f00002c, 0x0000002c,                 /* 098 - 152 */
-       0x808c0003, 0x00000010,                 /* 0a0 - 160 */
-       0x808c0002, 0x00000008,                 /* 0a8 - 168 */
-       0x98080000, 0x0000ff07,                 /* 0b0 - 176 */
-       0x60000040, 0x00000000,                 /* 0b8 - 184 */
-       0x1f000034, 0x00000034,                 /* 0c0 - 192 */
-       0x98080000, 0x0000ff0b,                 /* 0c8 - 200 */
-       0x58000008, 0x00000000,                 /* 0d0 - 208 */
-       0x60000040, 0x00000000,                 /* 0d8 - 216 */
-       0x80880000, 0xffffff20,                 /* 0e0 - 224 */
-       0x7c027f00, 0x00000000,                 /* 0e8 - 232 */
-       0x60000040, 0x00000000,                 /* 0f0 - 240 */
-       0x48000000, 0x00000000,                 /* 0f8 - 248 */
-       0x98080000, 0x0000ff02,                 /* 100 - 256 */
-       0x60000040, 0x00000000,                 /* 108 - 264 */
-       0x87830000, 0xfffffef0,                 /* 110 - 272 */
-       0x1f00002c, 0x0000002c,                 /* 118 - 280 */
-       0x98040004, 0x0000ff08,                 /* 120 - 288 */
-       0x7c027f00, 0x00000000,                 /* 128 - 296 */
-       0x60000040, 0x00000000,                 /* 130 - 304 */
-       0x48000000, 0x00000000,                 /* 138 - 312 */
-       0x98080000, 0x0000ff01,                 /* 140 - 320 */
-       0x54000000, 0x00000038,                 /* 148 - 328 */
-       0x740a8f00, 0x00000000,                 /* 150 - 336 */
-       0x6a340000, 0x00000000,                 /* 158 - 344 */
-       0x9f030000, 0x0000ff09,                 /* 160 - 352 */
-       0x1f00001c, 0x0000001c,                 /* 168 - 360 */
-       0x98080000, 0x0000ff03,                 /* 170 - 368 */
-       0x60000040, 0x00000000,                 /* 178 - 376 */
-       0x80880000, 0xfffffe80,                 /* 180 - 384 */
-       0x74011000, 0x00000000,                 /* 188 - 392 */
-       0x980c0000, 0x0000ff04,                 /* 190 - 400 */
-       0x741a4000, 0x00000000,                 /* 198 - 408 */
-       0x80880000, 0xffffffa0,                 /* 1a0 - 416 */
-       0x1e000004, 0x00000004,                 /* 1a8 - 424 */
-       0x80880000, 0xfffffe50,                 /* 1b0 - 432 */
-       0x60000008, 0x00000000,                 /* 1b8 - 440 */
-       0x1a00000c, 0x0000000c,                 /* 1c0 - 448 */
-       0x80880000, 0xfffffe38,                 /* 1c8 - 456 */
-       0x1800003c, 0x0000003c,                 /* 1d0 - 464 */
-       0x88830000, 0xfffffe28,                 /* 1d8 - 472 */
-       0x18000044, 0x00000044,                 /* 1e0 - 480 */
+const u_int32_t siopng_scripts[] = {
+       0x47000000, 0x00000150,                 /* 000 -   0 */
+       0x7a071000, 0x00000000,                 /* 008 -   8 */
+       0x878b0000, 0x00000030,                 /* 010 -  16 */
+       0x868a0000, 0x00000198,                 /* 018 -  24 */
+       0x828a0000, 0x000001a0,                 /* 020 -  32 */
+       0x808a0000, 0x000001b0,                 /* 028 -  40 */
+       0x818a0000, 0x00000238,                 /* 030 -  48 */



Home | Main Index | Thread Index | Old Index