Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/simonb-timecounters]: src/sys Sync with head.
details: https://anonhg.NetBSD.org/src/rev/c5687bb640d2
branches: simonb-timecounters
changeset: 587922:c5687bb640d2
user: kardel <kardel%NetBSD.org@localhost>
date: Wed Jun 07 15:49:37 2006 +0000
description:
Sync with head.
diffstat:
sys/arch/amiga/dev/ite_et.c | 21 +-
sys/arch/evbmips/atheros/autoconf.c | 18 +-
sys/arch/evbmips/atheros/machdep.c | 8 +-
sys/arch/evbmips/conf/AP30 | 202 +
sys/arch/i386/bioscall/Makefile | 15 +-
sys/arch/i386/conf/GENERIC | 6 +-
sys/arch/i386/include/param.h | 6 +-
sys/arch/ibmnws/pci/pchb.c | 15 +-
sys/arch/ibmnws/pci/pcib.c | 13 +-
sys/arch/mac68k/mac68k/macrom.c | 13 +-
sys/arch/mips/atheros/ar531x_board.c | 134 +-
sys/arch/mips/atheros/arbus.c | 8 +-
sys/arch/mips/atheros/dev/if_ath_arbus.c | 24 +-
sys/arch/mips/atheros/include/ar531xreg.h | 67 +-
sys/arch/mips/atheros/include/ar531xvar.h | 8 +-
sys/arch/mips/include/lock.h | 6 +-
sys/arch/powerpc/oea/oea_machdep.c | 8 +-
sys/arch/sparc64/conf/GENERIC32 | 6 +-
sys/conf/files | 8 +-
sys/contrib/dev/ath/README | 21 +-
sys/contrib/dev/ath/ah.h | 57 +-
sys/contrib/dev/ath/ah_desc.h | 4 +-
sys/contrib/dev/ath/ah_soc.h | 110 +
sys/contrib/dev/ath/netbsd/ah_osdep.c | 31 +-
sys/contrib/dev/ath/netbsd/ah_osdep.h | 41 +-
sys/contrib/dev/ath/public/alpha-elf.hal.o.uu | 20488 ++++++++-------
sys/contrib/dev/ath/public/ap30.hal.o.uu | 3846 +++
sys/contrib/dev/ath/public/ap30.inc | 69 +
sys/contrib/dev/ath/public/ap30.opt_ah.h | 5 +
sys/contrib/dev/ath/public/ap43.hal.o.uu | 3830 ++
sys/contrib/dev/ath/public/ap43.inc | 69 +
sys/contrib/dev/ath/public/ap43.opt_ah.h | 4 +
sys/contrib/dev/ath/public/ap51.hal.o.uu | 3588 ++
sys/contrib/dev/ath/public/ap51.inc | 69 +
sys/contrib/dev/ath/public/ap51.opt_ah.h | 4 +
sys/contrib/dev/ath/public/ap61.hal.o.uu | 3565 ++
sys/contrib/dev/ath/public/ap61.inc | 69 +
sys/contrib/dev/ath/public/ap61.opt_ah.h | 3 +
sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu | 11822 ++++----
sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc | 5 +-
sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu | 11277 ++++----
sys/contrib/dev/ath/public/armv4-be-elf.inc | 10 +-
sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h | 1 +
sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu | 10436 ++++---
sys/contrib/dev/ath/public/armv4-le-elf.inc | 10 +-
sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h | 1 +
sys/contrib/dev/ath/public/i386-elf.hal.o.uu | 8509 +++---
sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu | 11006 ++++----
sys/contrib/dev/ath/public/mips-be-elf.inc | 7 +-
sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h | 1 +
sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu | 11055 ++++----
sys/contrib/dev/ath/public/mips-le-elf.inc | 7 +-
sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h | 1 +
sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu | 12434 ++++----
sys/contrib/dev/ath/public/mips1-be-elf.inc | 7 +-
sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h | 1 +
sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu | 11521 ++++----
sys/contrib/dev/ath/public/mips1-le-elf.inc | 7 +-
sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h | 1 +
sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu | 12579 ++++----
sys/contrib/dev/ath/public/mipsisa32-be-elf.inc | 7 +-
sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h | 1 +
sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu | 12059 ++++----
sys/contrib/dev/ath/public/mipsisa32-le-elf.inc | 7 +-
sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h | 1 +
sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu | 10956 ++++----
sys/contrib/dev/ath/public/powerpc-be-eabi.inc | 9 +-
sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h | 2 +-
sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu | 10956 ++++----
sys/contrib/dev/ath/public/powerpc-be-elf.inc | 9 +-
sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h | 2 +-
sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu | 11131 ++++----
sys/contrib/dev/ath/public/powerpc-le-eabi.inc | 9 +-
sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h | 2 +-
sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu | 9505 +++---
sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu | 5744 ++++
sys/contrib/dev/ath/public/sparc-be-elf.inc | 72 +
sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h | 8 +
sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu | 13322 +++++-----
sys/contrib/dev/ath/public/sparc64-be-elf.inc | 8 +-
sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu | 11447 ++++----
sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu | 10963 ++++----
sys/contrib/dev/ath/public/xscale-be-elf.inc | 9 +-
sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h | 2 +-
sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu | 10965 ++++----
sys/contrib/dev/ath/public/xscale-le-elf.inc | 9 +-
sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h | 2 +-
sys/contrib/dev/ath/version.h | 4 +-
sys/dev/ata/wd.c | 6 +-
sys/dev/cardbus/cardbus.c | 14 +-
sys/dev/cardbus/cardbus_map.c | 7 +-
sys/dev/cardbus/files.cardbus | 6 +-
sys/dev/cardbus/if_ath_cardbus.c | 15 +-
sys/dev/cardbus/if_ral_cardbus.c | 90 +-
sys/dev/cardbus/if_rtw_cardbus.c | 7 +-
sys/dev/ic/ath.c | 51 +-
sys/dev/ic/athvar.h | 6 +-
sys/dev/ic/ral.c | 2754 --
sys/dev/ic/ralreg.h | 314 -
sys/dev/ic/ralvar.h | 167 -
sys/dev/ic/rt2560.c | 2935 ++
sys/dev/ic/rt2560reg.h | 316 +
sys/dev/ic/rt2560var.h | 177 +
sys/dev/ic/rt2661.c | 3118 ++
sys/dev/ic/rt2661reg.h | 337 +
sys/dev/ic/rt2661var.h | 178 +
sys/dev/isa/it.c | 6 +-
sys/dev/isa/itvar.h | 4 +-
sys/dev/pci/files.pci | 6 +-
sys/dev/pci/if_ath_pci.c | 17 +-
sys/dev/pci/if_ral_pci.c | 91 +-
sys/dev/pci/if_wm.c | 67 +-
sys/dev/pci/pcidevs | 15 +-
sys/dev/pci/pcidevs.h | 15 +-
sys/dev/pci/pcidevs_data.h | 46 +-
sys/dev/usb/usb_subr.c | 27 +-
sys/dev/usb/usbdevs | 5 +-
sys/dev/usb/usbdevs.h | 7 +-
sys/dev/usb/usbdevs_data.h | 12 +-
sys/kern/tty.c | 10 +-
sys/miscfs/portal/portal.h | 4 +-
sys/miscfs/portal/portal_vnops.c | 7 +-
122 files changed, 142007 insertions(+), 113198 deletions(-)
diffs (truncated from 258840 to 300 lines):
diff -r bc9b33134b9c -r c5687bb640d2 sys/arch/amiga/dev/ite_et.c
--- a/sys/arch/amiga/dev/ite_et.c Mon Jun 05 15:02:47 2006 +0000
+++ b/sys/arch/amiga/dev/ite_et.c Wed Jun 07 15:49:37 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_et.c,v 1.10 2005/12/11 12:16:28 christos Exp $ */
+/* $NetBSD: ite_et.c,v 1.10.6.1 2006/06/07 15:49:37 kardel Exp $ */
/*
* Copyright (c) 1995 Ezra Story
@@ -36,7 +36,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.10 2005/12/11 12:16:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.10.6.1 2006/06/07 15:49:37 kardel Exp $");
#include "grfet.h"
#if NGRFET > 0
@@ -253,20 +253,25 @@
static void etbcopy(const void *src, void *dst, size_t len)
{
int i;
+ char *cdst;
+ const char *csrc;
- if (src == dst)
+ cdst = (char*)dst;
+ csrc = (const char*)src;
+
+ if (csrc == cdst)
return;
- if (src > dst)
+ if (csrc > cdst)
for (i=len; i>0; i--) {
- *((char *)dst)++ = *((const char *)src)++;
+ *cdst++ = *csrc++;
}
else {
- ((const char *)src) += len;
- ((char *)dst) += len;
+ csrc += len;
+ cdst += len;
for (i=len; i>0; i--){
- *--((char *)dst) = *--((const char *)src);
+ *--cdst = *--csrc;
}
}
}
diff -r bc9b33134b9c -r c5687bb640d2 sys/arch/evbmips/atheros/autoconf.c
--- a/sys/arch/evbmips/atheros/autoconf.c Mon Jun 05 15:02:47 2006 +0000
+++ b/sys/arch/evbmips/atheros/autoconf.c Wed Jun 07 15:49:37 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.1.8.3 2006/06/01 22:34:30 kardel Exp $ */
+/* $NetBSD: autoconf.c,v 1.1.8.4 2006/06/07 15:49:37 kardel Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.1.8.3 2006/06/01 22:34:30 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.1.8.4 2006/06/07 15:49:37 kardel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,7 +80,7 @@
device_register(struct device *dev, void *aux)
{
struct arbus_attach_args *aa = aux;
- struct ar531x_board_info *info;
+ const struct ar531x_boarddata *info;
info = ar531x_board_info();
if (info == NULL) {
@@ -96,12 +96,12 @@
/* Fetch the MAC addresses from YAMON. */
if (device_is_a(dev, "ae")) {
prop_data_t pd;
- uint8_t *enet;
+ const uint8_t *enet;
if (aa->aa_addr == AR531X_ENET0_BASE)
- enet = info->ab_enet0_mac;
+ enet = info->enet0Mac;
else if (aa->aa_addr == AR531X_ENET1_BASE)
- enet = info->ab_enet1_mac;
+ enet = info->enet1Mac;
else
return;
@@ -117,12 +117,12 @@
if (device_is_a(dev, "ath")) {
prop_data_t pd;
- uint8_t *enet;
+ const uint8_t *enet;
if (aa->aa_addr == AR531X_WLAN0_BASE)
- enet = info->ab_wlan0_mac;
+ enet = info->wlan0Mac;
else if (aa->aa_addr == AR531X_WLAN1_BASE)
- enet = info->ab_wlan1_mac;
+ enet = info->wlan1Mac;
else
return;
diff -r bc9b33134b9c -r c5687bb640d2 sys/arch/evbmips/atheros/machdep.c
--- a/sys/arch/evbmips/atheros/machdep.c Mon Jun 05 15:02:47 2006 +0000
+++ b/sys/arch/evbmips/atheros/machdep.c Wed Jun 07 15:49:37 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.2.6.2 2006/04/22 11:37:24 simonb Exp $ */
+/* $NetBSD: machdep.c,v 1.2.6.3 2006/06/07 15:49:37 kardel Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -147,7 +147,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.2.6.2 2006/04/22 11:37:24 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.2.6.3 2006/06/07 15:49:37 kardel Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -223,7 +223,7 @@
caddr_t v;
uint32_t memcfg, bank0, bank1;
uint32_t memsize;
- struct ar531x_board_info *infop;
+ const struct ar531x_boarddata *infop;
extern char edata[], end[]; /* XXX */
@@ -237,7 +237,7 @@
panic("No board info!");
/* set CPU model info for sysctl_hw */
- snprintf(cpu_model, 64, "%s", infop->ab_name);
+ snprintf(cpu_model, 64, "%s", infop->boardName);
/*
* Set up the exception vectors and CPU-specific function
diff -r bc9b33134b9c -r c5687bb640d2 sys/arch/evbmips/conf/AP30
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbmips/conf/AP30 Wed Jun 07 15:49:37 2006 +0000
@@ -0,0 +1,202 @@
+# $NetBSD: AP30,v 1.1.2.2 2006/06/07 15:49:37 kardel Exp $
+
+include "arch/evbmips/conf/std.atheros"
+
+#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+
+#ident "AP30-$Revision: 1.1.2.2 $"
+
+maxusers 32
+
+makeoptions COPTS="-Os" # Optimise for space. Implies -O2
+makeoptions ATH_MACHINE_HAL=ap30
+
+options MIPS32
+options NOFPU # No FPU
+options SOFTFLOAT # emulate FPU insn
+
+# Options for necessary to use MD
+#options MEMORY_DISK_HOOKS
+#options MEMORY_DISK_IS_ROOT # force root on memory disk
+#options MEMORY_DISK_SERVER=0 # no userspace memory disk support
+#options MEMORY_DISK_ROOT_SIZE=6144 # size of memory disk, in blocks
+#options MEMORY_DISK_ROOT_SIZE=16384 # size of memory disk, in blocks
+#options MEMORY_DISK_ROOT_SIZE=7300
+
+# Size reduction options
+options MALLOC_NOINLINE
+options VNODE_OP_NOINLINE
+options PIPE_SOCKETPAIR
+options SOSEND_NO_LOAN
+
+# Standard system options
+#options KTRACE # system call tracing support
+#options SYSVMSG # System V message queues
+#options SYSVSEM # System V semaphores
+#options SYSVSHM # System V shared memory
+#options SHMMAXPGS=1024 # 1024 pages is the default
+#options LKM # loadable kernel modules
+options NTP # network time protocol
+
+# Debugging options
+options DIAGNOSTIC # extra kernel sanity checking
+#options DEBUG # extra kernel debugging support
+#options KMEMSTATS # kernel memory statistics (vmstat -m)
+#options USERCONF # userconf(4) support
+#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+options DDB # kernel dynamic debugger
+options DDB_HISTORY_SIZE=100 # enable history editing in DDB
+makeoptions DEBUG="-g" # compile full symbol table
+options SYMTAB_SPACE=150000 # size for embedded symbol table
+
+# Compatibility options
+#options COMPAT_43 # compatibility with 4.3BSD binaries
+#options COMPAT_09 # NetBSD 0.9 binary compatibility
+#options COMPAT_10 # NetBSD 1.0 binary compatibility
+#options COMPAT_11 # NetBSD 1.1 binary compatibility
+#options COMPAT_12 # NetBSD 1.2 binary compatibility
+#options COMPAT_13 # NetBSD 1.3 binary compatibility
+#options COMPAT_14 # NetBSD 1.4 binary compatibility
+#options COMPAT_16 # NetBSD 1.6 binary compatibility
+#options COMPAT_20 # NetBSD 2.0 binary compatibility
+options COMPAT_30 # NetBSD 3.0 compatibility.
+#options EXEC_ECOFF # exec ECOFF binaries
+#options COMPAT_ULTRIX # binary compatibility with Ultrix
+#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+
+# File systems
+file-system FFS # Berkeley Fast Filesystem
+file-system MFS # memory-based filesystem
+#file-system EXT2FS # second extended file system (linux)
+file-system NFS # Sun NFS-compatible filesystem client
+#file-system KERNFS # kernel data-structure filesystem
+#file-system NULLFS # NULL layered filesystem
+#file-system OVERLAY # overlay file system
+#file-system FDESC # user file descriptor filesystem
+#file-system UMAPFS # uid/gid remapping filesystem
+#file-system LFS # Log-based filesystem (still experimental)
+#file-system PORTAL # portal filesystem (still experimental)
+#file-system PROCFS # /proc
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+#file-system UNION # union file system
+#file-system MSDOSFS # MS-DOS FAT filesystem(s).
+#file-system CODA # Coda File System; also needs vcoda (below)
+#file-system PTYFS # /dev/pts/N support
+
+# File system options
+#options NFSSERVER # Sun NFS-compatible filesystem server
+#options QUOTA # FFS quotas
+#options FFS_EI # FFS Endian Independant support
+#options SOFTDEP # FFS soft updates support.
+options FFS_NO_SNAPSHOT # No FFS snapshot support
+#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
+ # immutable) behave as system flags.
+
+# Networking options
+#options GATEWAY # IP packet forwarding
+options INET # Internet protocols
+#options INET6 # IPV6
+#options IPSEC # IP security
+#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
+#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
+#options IPSEC_DEBUG # debug for IP security
+#options MROUTING # packet forwarding of multicast packets
+#options PIM # Protocol Independent Multicast
+#options NS # Xerox NS networking
+#options NSIP # Xerox NS tunneling over IP
+#options ISO,TPIP # OSI networking
+#options EON # OSI tunneling over IP
+#options CCITT,LLC,HDLC # X.25
+#options NETATALK # AppleTalk (over Ethernet) protocol
+#options PPP_BSDCOMP # BSD-Compress compression support for PPP
+#options PPP_DEFLATE # Deflate compression support for PPP
+#options PPP_FILTER # Active filter support for PPP (requires bpf)
+#options PFIL_HOOKS # pfil(9) packet filter hooks
+#options IPFILTER_LOG # ipmon(8) log support
+
+# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
+#options TCP_COMPAT_42
+
+# These options enable verbose messages for several subsystems.
+# Warning, these may compile large string tables into the kernel!
+options MIIVERBOSE # verbose PHY autoconfig messages
+
+# Bitmask for enabling the PCI IDE channels in the southbridge.
+# Set bit 0 (0x01) for channel 0, bit 1 (0x02) for channel 1.
+#
+# Do this if your firmware (usually PMON and YAMON) doens't enable the IDE
+# channels for you (thus causing the NetBSD `pciide' driver to ignore them).
+#options PCI_NETBSD_ENABLE_IDE=0x1
+
+options NFS_BOOT_DHCP
+options NFS_V2_ONLY
+
+config netbsd root on ? type ?
+
+
+mainbus0 at root
+cpu0 at mainbus?
+arbus0 at mainbus?
+
+com* at arbus? addr ?
+ae* at arbus? addr ?
+ath* at arbus? addr ?
+athflash* at arbus? addr ?
+
+# no RTC! so fake with a stub (required to prevent evbmips panic)
+
+
+# MII/PHY support
+#acphy* at mii? phy ? # DAltima AC101 and AMD Am79c874 PHYs
+#amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
Home |
Main Index |
Thread Index |
Old Index