CVS commit: src/sys/dev/ic
Module Name:src
Committed By: kiyohara
Date: Mon Nov 23 09:41:53 UTC 2009
Modified Files:
src/sys/dev/ic: lan9118.c
Log Message:
- Wait the ready 5sec, not 5msec.
- Set IFM_ACTIVE to ifm_status instead of ifm_active. ifconfig(8) always said
'no carrier'...
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ic/lan9118.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/lan9118.c
diff -u src/sys/dev/ic/lan9118.c:1.1 src/sys/dev/ic/lan9118.c:1.2
--- src/sys/dev/ic/lan9118.c:1.1 Sun Aug 9 06:40:10 2009
+++ src/sys/dev/ic/lan9118.c Mon Nov 23 09:41:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lan9118.c,v 1.1 2009/08/09 06:40:10 kiyohara Exp $ */
+/* $NetBSD: lan9118.c,v 1.2 2009/11/23 09:41:53 kiyohara Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lan9118.c,v 1.1 2009/08/09 06:40:10 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: lan9118.c,v 1.2 2009/11/23 09:41:53 kiyohara Exp $);
/*
* The LAN9118 Family
@@ -503,7 +503,7 @@
s = splnet();
/* wait for PMT_CTRL[READY] */
- timo = mstohz(5); /* 5sec */
+ timo = mstohz(5000); /* 5sec */
while (!(bus_space_read_4(sc-sc_iot, sc-sc_ioh, LAN9118_PMT_CTRL)
LAN9118_PMT_CTRL_READY)) {
bus_space_write_4(sc-sc_iot, sc-sc_ioh, LAN9118_BYTE_TEST,
@@ -770,7 +770,7 @@
ifmr-ifm_active |= IFM_NONE;
return;
}
- ifmr-ifm_active |= IFM_ACTIVE;
+ ifmr-ifm_status |= IFM_ACTIVE;
physcs = lan9118_mii_readreg(sc, LAN9118_IPHY_ADDR, LAN9118_PHYSCSR);
if (IFM_SUBTYPE(ifm-ifm_media) == IFM_AUTO) {
if (!(physcs LAN9118_PHYSCSR_AUTODONE)) {
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: plunky
Date: Mon Nov 23 10:08:47 UTC 2009
Modified Files:
src/lib/libc/gen: vis.c
Log Message:
fix VIS_HTTPSTYLE to not convert safe ($-_.+) and extra (!*'(),)
characters as mentioned in rfc1738 and rfc1808 and, I think intended
all along in this code but the logic was inverted.
Don't use strchr as it also matches the NUL character which we want
to escape, just compare against the chars directly as done in the
FreeBSD code.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/lib/libc/gen/vis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/vis.c
diff -u src/lib/libc/gen/vis.c:1.40 src/lib/libc/gen/vis.c:1.41
--- src/lib/libc/gen/vis.c:1.40 Wed Feb 11 13:52:28 2009
+++ src/lib/libc/gen/vis.c Mon Nov 23 10:08:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.c,v 1.40 2009/02/11 13:52:28 christos Exp $ */
+/* $NetBSD: vis.c,v 1.41 2009/11/23 10:08:47 plunky Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: vis.c,v 1.40 2009/02/11 13:52:28 christos Exp $);
+__RCSID($NetBSD: vis.c,v 1.41 2009/11/23 10:08:47 plunky Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -120,13 +120,20 @@
static char *
do_hvis(char *dst, int c, int flag, int nextc, const char *extra)
{
- if (!isascii(c) || !isalnum(c) || strchr($-_.+!*'(),, c) != NULL) {
+
+ if ((isascii(c) isalnum(c))
+ /* safe */
+ || c == '$' || c == '-' || c == '_' || c == '.' || c == '+'
+ /* extra */
+ || c == '!' || c == '*' || c == '\'' || c == '(' || c == ')'
+ || c == ',') {
+ dst = do_svis(dst, c, flag, nextc, extra);
+ } else {
*dst++ = '%';
*dst++ = xtoa(((unsigned int)c 4) 0xf);
*dst++ = xtoa((unsigned int)c 0xf);
- } else {
- dst = do_svis(dst, c, flag, nextc, extra);
}
+
return dst;
}
CVS commit: src/sys/external/intel-public/acpica/dist/include
Module Name:src Committed By: cegger Date: Mon Nov 23 10:50:38 UTC 2009 Modified Files: src/sys/external/intel-public/acpica/dist/include: actbl1.h Log Message: Update ACPI_SRAT_CPU_AFFINITY to match ACPI specification 4.0. XXX I don't know if this already happened upstream but it will sooner or later if not. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/intel-public/acpica/dist/include/actbl1.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/intel-public/acpica/dist/include/actbl1.h diff -u src/sys/external/intel-public/acpica/dist/include/actbl1.h:1.1.1.1 src/sys/external/intel-public/acpica/dist/include/actbl1.h:1.2 --- src/sys/external/intel-public/acpica/dist/include/actbl1.h:1.1.1.1 Tue Aug 18 16:23:34 2009 +++ src/sys/external/intel-public/acpica/dist/include/actbl1.h Mon Nov 23 10:50:38 2009 @@ -1088,7 +1088,7 @@ UINT32 Flags; UINT8 LocalSapicEid; UINT8 ProximityDomainHi[3]; -UINT32 Reserved; /* Reserved, must be zero */ +UINT32 ClockDomain; } ACPI_SRAT_CPU_AFFINITY;
CVS commit: src/sys/rump/dev/lib/libdisk
Module Name:src
Committed By: pooka
Date: Mon Nov 23 11:20:25 UTC 2009
Modified Files:
src/sys/rump/dev/lib/libdisk: Makefile
Log Message:
kern_physio is already provided by rumpvfs
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libdisk/Makefile
diff -u src/sys/rump/dev/lib/libdisk/Makefile:1.4 src/sys/rump/dev/lib/libdisk/Makefile:1.5
--- src/sys/rump/dev/lib/libdisk/Makefile:1.4 Tue Oct 6 09:12:47 2009
+++ src/sys/rump/dev/lib/libdisk/Makefile Mon Nov 23 11:20:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/10/06 09:12:47 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2009/11/23 11:20:25 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../kern \
@@ -13,7 +13,7 @@
.if ${MACHINE} == i386
# sys/kern
-SRCS= kern_physio.c subr_disk.c subr_disk_mbr.c subr_disk_open.c
+SRCS= subr_disk.c subr_disk_mbr.c subr_disk_open.c
# sys/dev
SRCS+= dksubr.c dk.c
.else
CVS commit: src/sys/rump/dev/lib/libraidframe
Module Name:src
Committed By: pooka
Date: Mon Nov 23 12:23:20 UTC 2009
Modified Files:
src/sys/rump/dev/lib/libraidframe: Makefile
Log Message:
Add rf_paritymap.c, which is now required for raidframe.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libraidframe/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libraidframe/Makefile
diff -u src/sys/rump/dev/lib/libraidframe/Makefile:1.2 src/sys/rump/dev/lib/libraidframe/Makefile:1.3
--- src/sys/rump/dev/lib/libraidframe/Makefile:1.2 Mon Sep 7 14:28:18 2009
+++ src/sys/rump/dev/lib/libraidframe/Makefile Mon Nov 23 12:23:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/09/07 14:28:18 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2009/11/23 12:23:20 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/raidframe
@@ -19,7 +19,7 @@
rf_raid5.c rf_raid5_rotatedspare.c rf_reconbuffer.c \
rf_reconmap.c rf_reconstruct.c rf_reconutil.c rf_revent.c \
rf_shutdown.c rf_sstf.c rf_states.c rf_stripelocks.c \
- rf_strutils.c rf_utils.c rf_compat50.c
+ rf_strutils.c rf_utils.c rf_compat50.c rf_paritymap.c
SRCS+= component.c
CVS commit: src/distrib/utils/sysinst/arch/macppc
Module Name:src
Committed By: tsutsui
Date: Mon Nov 23 13:25:02 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/macppc: md.c
Log Message:
Don't try installboot(8) if offset of PART_A is not zero.
As man page says, installboot(8) is required only OpenFirmware 1 and 2
machines and even on such machines the root partition has to be at the
beginning of the disk to make installboot(8) work.
On OpenFirmware version 3 machines, the strategy provided by
installboot(8) doesn't work, and they need to have an extra
native partition (HFS or FAT16) which can be recognized by
the newer firmware to put a loadable bootloader.
If PART_A has some offset, we can assume the disk is partitioned
for a machine with OF3, which does't require installboot(8).
Eventually, we should provide an independent partitioning method
for OpenFirmware 3 machines (fdisk MBR partition + FAT16 partition
for ofwboot.xcf as OpenBSD does), but it may require some new API
to get OF version in sysinst.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/utils/sysinst/arch/macppc/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/macppc/md.c
diff -u src/distrib/utils/sysinst/arch/macppc/md.c:1.41 src/distrib/utils/sysinst/arch/macppc/md.c:1.42
--- src/distrib/utils/sysinst/arch/macppc/md.c:1.41 Sat Sep 19 14:57:29 2009
+++ src/distrib/utils/sysinst/arch/macppc/md.c Mon Nov 23 13:25:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.41 2009/09/19 14:57:29 abs Exp $ */
+/* $NetBSD: md.c,v 1.42 2009/11/23 13:25:02 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -154,6 +154,31 @@
{
const char *bootfile = /boot;
+ /*
+ * XXX
+ * Only OpenFirmware version 1 and 2 machines need installboot(8)
+ * and it uses a faked Apple partition map with the primary bootxx.
+ * installboot(8) assumes that root partition is at the beginning of
+ * the disk and put a faked Apple partition map at the top of
+ * the partition, so it won't work if root partition has some
+ * offset from physical block 0 where the Apple driver descriptor
+ * map resides on.
+ *
+ * On OpenFirmware version 3 machines, the strategy used on OF1/2
+ * machines doesn't work (they don't recognize boot code info
+ * in Apple partition map entries) and they need to have
+ * an extra native partition (HFS or MSDOSFS) which can be
+ * recognized by the newer firmware to put a loadable bootloader.
+ * installboot(8) against partition `a' on such machines might
+ * corrupt existing disklabel or a valid Apple partition map.
+ *
+ * Currently there is no way to see OF version on running machine
+ * yet, so assume partition a has some offset on OF3 machines
+ * and don't try installboot(8) in that case.
+ */
+ if (bsdlabel[PART_A].pi_offset != 0)
+ return 0;
+
printf (msg_string(MSG_dobootblks), diskdev);
cp_to_target(/usr/mdec/ofwboot, bootfile);
sync();
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Mon Nov 23 13:40:11 UTC 2009
Modified Files:
src/sys/arch/algor/include: disklabel.h
src/sys/arch/alpha/include: disklabel.h
src/sys/arch/amd64/include: disklabel.h
src/sys/arch/arc/include: disklabel.h
src/sys/arch/arm/include: disklabel.h
src/sys/arch/bebox/include: disklabel.h
src/sys/arch/cobalt/include: disklabel.h
src/sys/arch/evbmips/include: disklabel.h
src/sys/arch/evbppc/include: disklabel.h
src/sys/arch/hp700/include: disklabel.h
src/sys/arch/hpcarm/include: disklabel.h
src/sys/arch/hpcmips/include: disklabel.h
src/sys/arch/i386/include: disklabel.h
src/sys/arch/ia64/include: disklabel.h
src/sys/arch/ibmnws/include: disklabel.h
src/sys/arch/landisk/include: disklabel.h
src/sys/arch/mvmeppc/include: disklabel.h
src/sys/arch/ofppc/include: disklabel.h
src/sys/arch/playstation2/include: disklabel.h
src/sys/arch/prep/include: disklabel.h
src/sys/arch/rs6000/include: disklabel.h
src/sys/arch/sandpoint/include: disklabel.h
src/sys/arch/sbmips/include: disklabel.h
src/sys/arch/sh3/include: disklabel.h
src/sys/arch/x68k/include: disklabel.h
src/sys/arch/zaurus/include: disklabel.h
src/sys/kern: subr_disk_mbr.c
src/sys/rump/dev/lib/libdisk: Makefile
Log Message:
If cpu_disklabel includes struct dkbad, define __HAVE_DISKLABEL_DKBAD.
This allows use of subr_disk_mbr on all archs. Default to it for
the rump disk component. No functional change for regular kernels.
(The other option would've been to include dkbad in disklabels
everywhere, but arguably this approach has less possible side-effects,
especially given that wedges and related magic will take over the
world any second now).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/algor/include/disklabel.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/include/disklabel.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/include/disklabel.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arc/include/disklabel.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/include/disklabel.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/bebox/include/disklabel.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/cobalt/include/disklabel.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/include/disklabel.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/include/disklabel.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp700/include/disklabel.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcarm/include/disklabel.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpcmips/include/disklabel.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/include/disklabel.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/include/disklabel.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ibmnws/include/disklabel.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/landisk/include/disklabel.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mvmeppc/include/disklabel.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ofppc/include/disklabel.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/playstation2/include/disklabel.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/prep/include/disklabel.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/rs6000/include/disklabel.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sandpoint/include/disklabel.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sbmips/include/disklabel.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sh3/include/disklabel.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/include/disklabel.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/include/disklabel.h
cvs rdiff -u -r1.36 -r1.37 src/sys/kern/subr_disk_mbr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/algor/include/disklabel.h
diff -u src/sys/arch/algor/include/disklabel.h:1.3 src/sys/arch/algor/include/disklabel.h:1.4
--- src/sys/arch/algor/include/disklabel.h:1.3 Sun Dec 11 12:16:08 2005
+++ src/sys/arch/algor/include/disklabel.h Mon Nov 23 13:40:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.3 2005/12/11 12:16:08 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.4 2009/11/23 13:40:08 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -46,6 +46,7 @@
/* Just a dummy */
struct cpu_disklabel {
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad; /* must have one element. */
};
Index: src/sys/arch/alpha/include/disklabel.h
diff -u src/sys/arch/alpha/include/disklabel.h:1.9 src/sys/arch/alpha/include/disklabel.h:1.10
--- src/sys/arch/alpha/include/disklabel.h:1.9 Sun Dec 11 12:16:16 2005
+++ src/sys/arch/alpha/include/disklabel.h Mon Nov 23 13:40:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.9 2005/12/11 12:16:16 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.10 2009/11/23 13:40:09 pooka Exp $ */
/*
* Copyright (c) 1994, 1999 Christopher G. Demetriou
CVS commit: src
Module Name:src
Committed By: pooka
Date: Mon Nov 23 14:07:46 UTC 2009
Modified Files:
src: build.sh
Log Message:
Add more rumpdev configurations to rumptest.
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.220 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.219 src/build.sh:1.220
--- src/build.sh:1.219 Wed Nov 18 18:05:19 2009
+++ src/build.sh Mon Nov 23 14:07:45 2009
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.219 2009/11/18 18:05:19 pooka Exp $
+# $NetBSD: build.sh,v 1.220 2009/11/23 14:07:45 pooka Exp $
#
# Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1323,7 +1323,7 @@
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.219 2009/11/18 18:05:19 pooka Exp $
+# Generated from: \$NetBSD: build.sh,v 1.220 2009/11/23 14:07:45 pooka Exp $
# with these arguments: ${_args}
#
@@ -1518,7 +1518,9 @@
-lrumpnet_virtif -lrumpnet_netinet -lrumpnet_net -lrumpnet -lrump,
-lrumpnet_sockin -lrumpfs_smbfs -lrumpdev_netsmb
-lrumpcrypto -lrumpdev -lrumpnet -lrumpvfs -lrump,
- -lrumpnet_sockin -lrumpfs_nfs -lrumpnet -lrumpvfs -lrump'
+ -lrumpnet_sockin -lrumpfs_nfs -lrumpnet -lrumpvfs -lrump,
+ -lrumpdev_cgd -lrumpdev_raidframe -lrumpdev_disk -lrumpdev_rnd
+ -lrumpdev -lrumpvfs -lrumpcrypto -lrump'
dorump()
{
local doclean=
CVS commit: src/sys/rump/librump/rumpuser
Module Name:src
Committed By: pooka
Date: Mon Nov 23 14:39:35 UTC 2009
Modified Files:
src/sys/rump/librump/rumpuser: rumpuser_dl.c
Log Message:
Include link.h instead of the NetBSD-specific link_elf.h. Use
dlinfo() only if __ELF__ is defined.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpuser/rumpuser_dl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpuser/rumpuser_dl.c
diff -u src/sys/rump/librump/rumpuser/rumpuser_dl.c:1.5 src/sys/rump/librump/rumpuser/rumpuser_dl.c:1.6
--- src/sys/rump/librump/rumpuser/rumpuser_dl.c:1.5 Thu Nov 5 14:13:03 2009
+++ src/sys/rump/librump/rumpuser/rumpuser_dl.c Mon Nov 23 14:39:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_dl.c,v 1.5 2009/11/05 14:13:03 pooka Exp $ */
+/* $NetBSD: rumpuser_dl.c,v 1.6 2009/11/23 14:39:35 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -30,21 +30,21 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: rumpuser_dl.c,v 1.5 2009/11/05 14:13:03 pooka Exp $);
+__RCSID($NetBSD: rumpuser_dl.c,v 1.6 2009/11/23 14:39:35 pooka Exp $);
#include sys/types.h
#include sys/time.h
#include assert.h
#include dlfcn.h
-#include link_elf.h
+#include link.h
#include stdio.h
#include string.h
#include rump/rumpuser.h
-#if defined(__NetBSD__) || defined(__FreeBSD__)\
-|| (defined(__sun__) defined(__svr4__))
+#if defined(__ELF__) (defined(__NetBSD__) || defined(__FreeBSD__) \
+|| (defined(__sun__) defined(__svr4__)))
static int
process(const char *soname, rump_modinit_fn domodinit)
{
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: cegger Date: Mon Nov 23 14:42:39 UTC 2009 Modified Files: src/sys/dev/acpi: acpi_tz.c Log Message: evaluate _RTV as preparation for passive cooling. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/dev/acpi/acpi_tz.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/acpi/acpi_tz.c diff -u src/sys/dev/acpi/acpi_tz.c:1.47 src/sys/dev/acpi/acpi_tz.c:1.48 --- src/sys/dev/acpi/acpi_tz.c:1.47 Wed Sep 16 10:47:54 2009 +++ src/sys/dev/acpi/acpi_tz.c Mon Nov 23 14:42:39 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_tz.c,v 1.47 2009/09/16 10:47:54 mlelstv Exp $ */ +/* $NetBSD: acpi_tz.c,v 1.48 2009/11/23 14:42:39 cegger Exp $ */ /* * Copyright (c) 2003 Jared D. McNeill jmcne...@invisible.ca @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_tz.c,v 1.47 2009/09/16 10:47:54 mlelstv Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_tz.c,v 1.48 2009/11/23 14:42:39 cegger Exp $); #include sys/param.h #include sys/systm.h @@ -93,6 +93,8 @@ UINT32 hot; /* Package of references to processor objects for passive cooling */ ACPI_BUFFER psl; + /* Conveys if temperatures are absolute or relative values. */ + UINT32 rtv; /* Passive cooling temperature threshold */ UINT32 psv; /* Thermal constants for use in passive cooling formulas */ @@ -481,6 +483,13 @@ acpitz_get_integer(dv, _TC1, sc-sc_zone.tc1); acpitz_get_integer(dv, _TC2, sc-sc_zone.tc2); + /* ACPI spec: If _RTV is not present or present and zero, + * values are absolute. */ + acpitz_get_integer(dv, _RTV, sc-sc_zone.rtv); + if (sc-sc_zone.rtv == ATZ_TMP_INVALID) + sc-sc_zone.rtv = 0; + + acpitz_sane_temp(sc-sc_zone.tmp); acpitz_sane_temp(sc-sc_zone.crt); acpitz_sane_temp(sc-sc_zone.hot);
CVS commit: src/share/man/man4
Module Name:src Committed By: pooka Date: Mon Nov 23 16:41:27 UTC 2009 Modified Files: src/share/man/man4: wapbl.4 Log Message: Fix rev 1.10 a bit: currently raw devices are correct for newfs/tunefs, and the cooked one should be used for mount. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/wapbl.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/wapbl.4 diff -u src/share/man/man4/wapbl.4:1.11 src/share/man/man4/wapbl.4:1.12 --- src/share/man/man4/wapbl.4:1.11 Sun Nov 22 18:40:26 2009 +++ src/share/man/man4/wapbl.4 Mon Nov 23 16:41:26 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: wapbl.4,v 1.11 2009/11/22 18:40:26 mbalmer Exp $ +.\ $NetBSD: wapbl.4,v 1.12 2009/11/23 16:41:26 pooka Exp $ .\ .\ Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 21, 2009 +.Dd November 23, 2009 .Dt WAPBL 4 .Os .Sh NAME @@ -79,7 +79,7 @@ .Pp For a new file system, .Bd -literal -offset indent -newfs -s -64m /dev/wd0a +newfs -s -64m wd0a .Ed .Pp can be used to leave space for a 64MB journal at the end of @@ -89,7 +89,7 @@ .Xr tunefs 8 can be used as follows: .Bd -literal -offset indent -tunefs -l 64m /dev/wd0a +tunefs -l 64m wd0a .Ed .Pp to indicate that a journal of size 64MB on the file system on @@ -107,13 +107,13 @@ system. Running .Bd -literal -offset indent -tunefs -l 0 /dev/wd0a +tunefs -l 0 wd0a .Ed .Pp will schedule the log for removal on the next read-write mount, and running .Bd -literal -offset indent -tunefs -l 0 /dev/wd0a +tunefs -l 0 wd0a .Ed .Pp followed by
CVS commit: src/sys/external/intel-public/acpica/dist/common
Module Name:src
Committed By: cegger
Date: Mon Nov 23 17:16:50 UTC 2009
Modified Files:
src/sys/external/intel-public/acpica/dist/common: dmtbinfo.c
Log Message:
make iasl build again.
patch from tnn@
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c
diff -u src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c:1.1.1.1 src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c:1.2
--- src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c:1.1.1.1 Tue Aug 18 16:23:29 2009
+++ src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c Mon Nov 23 17:16:50 2009
@@ -1365,7 +1365,7 @@
{ACPI_DMT_FLAG0,ACPI_SRAT0_FLAG_OFFSET (Flags,0), Enabled},
{ACPI_DMT_UINT8,ACPI_SRAT0_OFFSET (LocalSapicEid), Local Sapic EID},
{ACPI_DMT_UINT24, ACPI_SRAT0_OFFSET (ProximityDomainHi[0]), Proximity Domain High(24)},
-{ACPI_DMT_UINT32, ACPI_SRAT0_OFFSET (Reserved), Reserved},
+{ACPI_DMT_UINT32, ACPI_SRAT0_OFFSET (ClockDomain),Clock Domain},
{ACPI_DMT_EXIT, 0, NULL}
};
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: rmind
Date: Mon Nov 23 18:20:46 UTC 2009
Modified Files:
src/sys/arch/arm/arm: ast.c
Log Message:
Amend #ifdef with DIAGNOSTIC case, avoids gcc warning about unused var.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/arm/ast.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/ast.c
diff -u src/sys/arch/arm/arm/ast.c:1.18 src/sys/arch/arm/arm/ast.c:1.19
--- src/sys/arch/arm/arm/ast.c:1.18 Sat Nov 21 20:32:17 2009
+++ src/sys/arch/arm/arm/ast.c Mon Nov 23 18:20:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ast.c,v 1.18 2009/11/21 20:32:17 rmind Exp $ */
+/* $NetBSD: ast.c,v 1.19 2009/11/23 18:20:46 rmind Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ast.c,v 1.18 2009/11/21 20:32:17 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ast.c,v 1.19 2009/11/23 18:20:46 rmind Exp $);
#include opt_ddb.h
@@ -76,7 +76,7 @@
/* Invoke MI userret code */
mi_userret(l);
-#ifdef __PROG32
+#if defined(__PROG32) defined(DIAGNOSTIC)
{
struct pcb *pcb = lwp_getpcb(l);
KASSERT((pcb-pcb_tf-tf_spsr IF32_bits) == 0);
CVS commit: [matt-nb5-mips64] src/sys/arch/sbmips/sbmips
Module Name:src
Committed By: matt
Date: Mon Nov 23 18:23:02 UTC 2009
Modified Files:
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: machdep.c
Log Message:
Use %#
To generate a diff of this commit:
cvs rdiff -u -r1.38.10.1 -r1.38.10.2 src/sys/arch/sbmips/sbmips/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.38.10.1 src/sys/arch/sbmips/sbmips/machdep.c:1.38.10.2
--- src/sys/arch/sbmips/sbmips/machdep.c:1.38.10.1 Mon Sep 7 23:01:43 2009
+++ src/sys/arch/sbmips/sbmips/machdep.c Mon Nov 23 18:23:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.38.10.1 2009/09/07 23:01:43 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.38.10.2 2009/11/23 18:23:02 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.38.10.1 2009/09/07 23:01:43 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.38.10.2 2009/11/23 18:23:02 matt Exp $);
#include opt_ddb.h
#include opt_execfmt.h
@@ -231,7 +231,7 @@
mem_cluster_cnt = 0;
while (cfe_enummem(idx, 0, start, len, type) == 0) {
added = 0;
- printf(Memory Block #%d start %08PRIx64X len %08PRIx64X: %s: ,
+ printf(Memory Block #%d start %#PRIx64 len %#PRIx64: %s: ,
idx, start, len, (type == CFE_MI_AVAILABLE) ?
Available : Reserved);
if ((type == CFE_MI_AVAILABLE)
CVS commit: [matt-nb5-mips64] src/sys/arch
Module Name:src
Committed By: matt
Date: Mon Nov 23 18:28:47 UTC 2009
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: locore.h
src/sys/arch/mips/sibyte/dev [matt-nb5-mips64]: sbgbus.c sbjcn.c
sbmac.c sbobio.c sbscn.c sbtimer.c sbwdog.c
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: cpu.c rtc.c sb1250_icu.c
src/sys/arch/sgimips/mace [matt-nb5-mips64]: mace.c
src/sys/arch/sgimips/sgimips [matt-nb5-mips64]: bus.c
Log Message:
mips3_ld/mips3_sd need to be passed a volatile uint64_t *
To generate a diff of this commit:
cvs rdiff -u -r1.78.36.1.2.4 -r1.78.36.1.2.5 \
src/sys/arch/mips/include/locore.h
cvs rdiff -u -r1.10 -r1.10.96.1 src/sys/arch/mips/sibyte/dev/sbgbus.c
cvs rdiff -u -r1.21 -r1.21.14.1 src/sys/arch/mips/sibyte/dev/sbjcn.c
cvs rdiff -u -r1.28.24.1 -r1.28.24.2 src/sys/arch/mips/sibyte/dev/sbmac.c
cvs rdiff -u -r1.16 -r1.16.98.1 src/sys/arch/mips/sibyte/dev/sbobio.c
cvs rdiff -u -r1.27 -r1.27.14.1 src/sys/arch/mips/sibyte/dev/sbscn.c
cvs rdiff -u -r1.13 -r1.13.28.1 src/sys/arch/mips/sibyte/dev/sbtimer.c
cvs rdiff -u -r1.7 -r1.7.94.1 src/sys/arch/mips/sibyte/dev/sbwdog.c
cvs rdiff -u -r1.18 -r1.18.16.1 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.16 -r1.16.38.1 src/sys/arch/sbmips/sbmips/rtc.c
cvs rdiff -u -r1.9 -r1.9.36.1 src/sys/arch/sbmips/sbmips/sb1250_icu.c
cvs rdiff -u -r1.15.12.1 -r1.15.12.2 src/sys/arch/sgimips/mace/mace.c
cvs rdiff -u -r1.55.16.1 -r1.55.16.2 src/sys/arch/sgimips/sgimips/bus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.78.36.1.2.4 src/sys/arch/mips/include/locore.h:1.78.36.1.2.5
--- src/sys/arch/mips/include/locore.h:1.78.36.1.2.4 Sat Sep 5 03:18:49 2009
+++ src/sys/arch/mips/include/locore.h Mon Nov 23 18:28:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.78.36.1.2.4 2009/09/05 03:18:49 matt Exp $ */
+/* $NetBSD: locore.h,v 1.78.36.1.2.5 2009/11/23 18:28:46 matt Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -140,7 +140,7 @@
#if defined(__GNUC__) !defined(__mips_o32)
static inline uint64_t
-mips3_ld(const uint64_t *va)
+mips3_ld(const volatile uint64_t *va)
{
uint64_t rv;
#if defined(__mips_o32)
@@ -173,7 +173,7 @@
return rv;
}
static inline void
-mips3_sd(uint64_t *va, uint64_t v)
+mips3_sd(volatile uint64_t *va, uint64_t v)
{
#if defined(__mips_o32)
uint32_t sr;
@@ -202,8 +202,8 @@
#endif
}
#else
-uint64_t mips3_ld(uint64_t *va);
-void mips3_sd(uint64_t *, uint64_t);
+uint64_t mips3_ld(volatile uint64_t *va);
+void mips3_sd(volatile uint64_t *, uint64_t);
#endif /* __GNUC__ */
#endif /* MIPS3 || MIPS4 || MIPS32 || MIPS64 */
Index: src/sys/arch/mips/sibyte/dev/sbgbus.c
diff -u src/sys/arch/mips/sibyte/dev/sbgbus.c:1.10 src/sys/arch/mips/sibyte/dev/sbgbus.c:1.10.96.1
--- src/sys/arch/mips/sibyte/dev/sbgbus.c:1.10 Sun Dec 11 12:18:12 2005
+++ src/sys/arch/mips/sibyte/dev/sbgbus.c Mon Nov 23 18:28:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbgbus.c,v 1.10 2005/12/11 12:18:12 christos Exp $ */
+/* $NetBSD: sbgbus.c,v 1.10.96.1 2009/11/23 18:28:46 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sbgbus.c,v 1.10 2005/12/11 12:18:12 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: sbgbus.c,v 1.10.96.1 2009/11/23 18:28:46 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -132,11 +132,11 @@
} else {
uint64_t rv;
- rv = mips3_ld((void *)MIPS_PHYS_TO_KSEG1(
+ rv = mips3_ld((volatile uint64_t *)MIPS_PHYS_TO_KSEG1(
A_IO_EXT_CS_BASE(sga.sga_chipsel) +
R_IO_EXT_START_ADDR));
sga.sga_startphys = (rv M_IO_START_ADDR) S_IO_ADDRBASE;
- rv = mips3_ld((void *)MIPS_PHYS_TO_KSEG1(
+ rv = mips3_ld((volatile uint64_t *)MIPS_PHYS_TO_KSEG1(
A_IO_EXT_CS_BASE(sga.sga_chipsel) +
R_IO_EXT_MULT_SIZE));
sga.sga_size = (rv M_IO_MULT_SIZE) S_IO_REGSIZE;
Index: src/sys/arch/mips/sibyte/dev/sbjcn.c
diff -u src/sys/arch/mips/sibyte/dev/sbjcn.c:1.21 src/sys/arch/mips/sibyte/dev/sbjcn.c:1.21.14.1
--- src/sys/arch/mips/sibyte/dev/sbjcn.c:1.21 Fri Jun 13 12:08:01 2008
+++ src/sys/arch/mips/sibyte/dev/sbjcn.c Mon Nov 23 18:28:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbjcn.c,v 1.21 2008/06/13 12:08:01 cegger Exp $ */
+/* $NetBSD: sbjcn.c,v 1.21.14.1 2009/11/23 18:28:46 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -103,7 +103,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sbjcn.c,v 1.21 2008/06/13 12:08:01 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: sbjcn.c,v 1.21.14.1 2009/11/23 18:28:46 matt Exp $);
#define SBJCN_DEBUG
@@ -225,8 +225,8 @@
CFATTACH_DECL(sbjcn, sizeof(struct sbjcn_softc),
sbjcn_match, sbjcn_attach, NULL, NULL);
-#define READ_REG(rp) (mips3_ld((uint64_t *)(rp)))
-#define WRITE_REG(rp, val) (mips3_sd((uint64_t *)(rp),
CVS commit: [matt-nb5-mips64] src/sys/arch
Module Name:src
Committed By: matt
Date: Mon Nov 23 18:46:51 UTC 2009
Modified Files:
src/sys/arch/mips/sibyte/dev [matt-nb5-mips64]: sbmac.c sbscn.c
sbtimer.c
src/sys/arch/sbmips/include [matt-nb5-mips64]: systemsw.h
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: sb1250_icu.c systemsw.c
Log Message:
Use vaddr_t instead uint32_t for storing a pc since the latter won't work in
a LP64 kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.28.24.2 -r1.28.24.3 src/sys/arch/mips/sibyte/dev/sbmac.c
cvs rdiff -u -r1.27.14.1 -r1.27.14.2 src/sys/arch/mips/sibyte/dev/sbscn.c
cvs rdiff -u -r1.13.28.1 -r1.13.28.2 src/sys/arch/mips/sibyte/dev/sbtimer.c
cvs rdiff -u -r1.7 -r1.7.28.1 src/sys/arch/sbmips/include/systemsw.h
cvs rdiff -u -r1.9.36.1 -r1.9.36.2 src/sys/arch/sbmips/sbmips/sb1250_icu.c
cvs rdiff -u -r1.14 -r1.14.28.1 src/sys/arch/sbmips/sbmips/systemsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/sibyte/dev/sbmac.c
diff -u src/sys/arch/mips/sibyte/dev/sbmac.c:1.28.24.2 src/sys/arch/mips/sibyte/dev/sbmac.c:1.28.24.3
--- src/sys/arch/mips/sibyte/dev/sbmac.c:1.28.24.2 Mon Nov 23 18:28:46 2009
+++ src/sys/arch/mips/sibyte/dev/sbmac.c Mon Nov 23 18:46:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbmac.c,v 1.28.24.2 2009/11/23 18:28:46 matt Exp $ */
+/* $NetBSD: sbmac.c,v 1.28.24.3 2009/11/23 18:46:50 matt Exp $ */
/*
* Copyright 2000, 2001, 2004
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sbmac.c,v 1.28.24.2 2009/11/23 18:28:46 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sbmac.c,v 1.28.24.3 2009/11/23 18:46:50 matt Exp $);
#include bpfilter.h
#include opt_inet.h
@@ -252,7 +252,7 @@
static void sbmac_promiscuous_mode(struct sbmac_softc *sc, int onoff);
static void sbmac_init_and_start(struct sbmac_softc *sc);
static uint64_t sbmac_addr2reg(u_char *ptr);
-static void sbmac_intr(void *xsc, uint32_t status, uint32_t pc);
+static void sbmac_intr(void *xsc, uint32_t status, vaddr_t pc);
static void sbmac_start(struct ifnet *ifp);
static void sbmac_setmulti(struct sbmac_softc *sc);
static int sbmac_ether_ioctl(struct ifnet *ifp, u_long cmd, void *data);
@@ -1731,7 +1731,7 @@
/* ARGSUSED */
static void
-sbmac_intr(void *xsc, uint32_t status, uint32_t pc)
+sbmac_intr(void *xsc, uint32_t status, vaddr_t pc)
{
struct sbmac_softc *sc = (struct sbmac_softc *) xsc;
struct ifnet *ifp = sc-sc_ethercom.ec_if;
Index: src/sys/arch/mips/sibyte/dev/sbscn.c
diff -u src/sys/arch/mips/sibyte/dev/sbscn.c:1.27.14.1 src/sys/arch/mips/sibyte/dev/sbscn.c:1.27.14.2
--- src/sys/arch/mips/sibyte/dev/sbscn.c:1.27.14.1 Mon Nov 23 18:28:47 2009
+++ src/sys/arch/mips/sibyte/dev/sbscn.c Mon Nov 23 18:46:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbscn.c,v 1.27.14.1 2009/11/23 18:28:47 matt Exp $ */
+/* $NetBSD: sbscn.c,v 1.27.14.2 2009/11/23 18:46:50 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -109,7 +109,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sbscn.c,v 1.27.14.1 2009/11/23 18:28:47 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sbscn.c,v 1.27.14.2 2009/11/23 18:46:50 matt Exp $);
#define SBSCN_DEBUG
@@ -170,7 +170,7 @@
int sbscn_init(u_long addr, int chan, int rate, tcflag_t cflag);
int sbscn_common_getc(u_long addr, int chan);
void sbscn_common_putc(u_long addr, int chan, int c);
-void sbscn_intr(void *arg, uint32_t status, uint32_t pc);
+void sbscn_intr(void *arg, uint32_t status, vaddr_t pc);
int sbscn_cngetc(dev_t dev);
void sbscn_cnputc(dev_t dev, int c);
@@ -1471,7 +1471,7 @@
}
void
-sbscn_intr(void *arg, uint32_t status, uint32_t pc)
+sbscn_intr(void *arg, uint32_t status, vaddr_t pc)
{
struct sbscn_channel *ch = arg;
u_char *put, *end;
Index: src/sys/arch/mips/sibyte/dev/sbtimer.c
diff -u src/sys/arch/mips/sibyte/dev/sbtimer.c:1.13.28.1 src/sys/arch/mips/sibyte/dev/sbtimer.c:1.13.28.2
--- src/sys/arch/mips/sibyte/dev/sbtimer.c:1.13.28.1 Mon Nov 23 18:28:47 2009
+++ src/sys/arch/mips/sibyte/dev/sbtimer.c Mon Nov 23 18:46:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbtimer.c,v 1.13.28.1 2009/11/23 18:28:47 matt Exp $ */
+/* $NetBSD: sbtimer.c,v 1.13.28.2 2009/11/23 18:46:50 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sbtimer.c,v 1.13.28.1 2009/11/23 18:28:47 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sbtimer.c,v 1.13.28.2 2009/11/23 18:46:50 matt Exp $);
#include sys/param.h
#include sys/device.h
@@ -64,10 +64,9 @@
CFATTACH_DECL(sbtimer, sizeof(struct sbtimer_softc),
sbtimer_match, sbtimer_attach, NULL, NULL);
-static void sbtimer_clockintr(void *arg, uint32_t status, uint32_t pc);
-static void sbtimer_statclockintr(void *arg, uint32_t status,
- uint32_t pc);
-static void sbtimer_miscintr(void *arg, uint32_t status, uint32_t pc);
+static void sbtimer_clockintr(void *arg, uint32_t status, vaddr_t pc);
+static void
CVS commit: [matt-nb5-mips64] src/sys/arch
Module Name:src
Committed By: cliff
Date: Mon Nov 23 23:48:58 UTC 2009
Modified Files:
src/sys/arch/evbmips/evbmips [matt-nb5-mips64]: interrupt.c
src/sys/arch/mips/include [matt-nb5-mips64]: cpu.h
Log Message:
fix types in struct clockframe and args to cpu_intr
to be corect for 32 or 64 bit kernel
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.18.1 src/sys/arch/evbmips/evbmips/interrupt.c
cvs rdiff -u -r1.90.16.7 -r1.90.16.8 src/sys/arch/mips/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/evbmips/interrupt.c
diff -u src/sys/arch/evbmips/evbmips/interrupt.c:1.11 src/sys/arch/evbmips/evbmips/interrupt.c:1.11.18.1
--- src/sys/arch/evbmips/evbmips/interrupt.c:1.11 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbmips/evbmips/interrupt.c Mon Nov 23 23:48:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.11 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: interrupt.c,v 1.11.18.1 2009/11/23 23:48:58 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.11 2008/04/28 20:23:17 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.11.18.1 2009/11/23 23:48:58 cliff Exp $);
#include sys/param.h
#include sys/device.h
@@ -50,7 +50,7 @@
}
void
-cpu_intr(u_int32_t status, u_int32_t cause, u_int32_t pc, u_int32_t ipending)
+cpu_intr(u_int32_t status, u_int32_t cause, vaddr_t pc, u_int32_t ipending)
{
struct clockframe cf;
struct cpu_info *ci;
Index: src/sys/arch/mips/include/cpu.h
diff -u src/sys/arch/mips/include/cpu.h:1.90.16.7 src/sys/arch/mips/include/cpu.h:1.90.16.8
--- src/sys/arch/mips/include/cpu.h:1.90.16.7 Sun Nov 15 00:42:17 2009
+++ src/sys/arch/mips/include/cpu.h Mon Nov 23 23:48:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.90.16.7 2009/11/15 00:42:17 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.90.16.8 2009/11/23 23:48:58 cliff Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -315,16 +315,16 @@
*/
#define cpu_swapout(p) panic(cpu_swapout: can't get here);
-void cpu_intr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
+void cpu_intr(uint32_t, uint32_t, vaddr_t, uint32_t);
/*
* Arguments to hardclock and gatherstats encapsulate the previous
* machine state in an opaque clockframe.
*/
struct clockframe {
- int pc; /* program counter at time of interrupt */
- int sr; /* status register at time of interrupt */
- int ppl; /* previous priority level at time of interrupt */
+ vaddr_t pc; /* program counter at time of interrupt */
+ uint32_t sr; /* status register at time of interrupt */
+ u_int ppl; /* previous priority level at time of interrupt */
};
/*
CVS commit: xsrc/external/mit/xf86-video-suntcx/dist/src
Module Name:xsrc
Committed By: macallan
Date: Tue Nov 24 03:46:19 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx_accel.c
Log Message:
Make TcxDownloadFromScreen() and TcxUploadToScreen() work and use them.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.3 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.4
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.3 Thu Aug 27 04:12:37 2009
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c Tue Nov 24 03:46:19 2009
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: tcx_accel.c,v 1.3 2009/08/27 04:12:37 macallan Exp $ */
+/* $NetBSD: tcx_accel.c,v 1.4 2009/11/24 03:46:19 macallan Exp $ */
#include sys/types.h
@@ -274,7 +274,9 @@
TcxUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
char *src, int src_pitch)
{
-char *dst= pDst-devPrivate.ptr;
+ScrnInfoPtr pScrn = xf86Screens[pDst-drawable.pScreen-myNum];
+TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
+char *dst= pTcx-fb + exaGetPixmapOffset(pDst);
intdst_pitch = exaGetPixmapPitch(pDst);
int bpp= pDst-drawable.bitsPerPixel;
@@ -300,7 +302,9 @@
TcxDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
char *dst, int dst_pitch)
{
-char *src= pSrc-devPrivate.ptr;
+ScrnInfoPtr pScrn = xf86Screens[pSrc-drawable.pScreen-myNum];
+TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
+char *src= pTcx-fb + exaGetPixmapOffset(pSrc);
intsrc_pitch = exaGetPixmapPitch(pSrc);
int bpp= pSrc-drawable.bitsPerPixel;
@@ -373,9 +377,8 @@
/* EXA hits more optimized paths when it does not have to fallback because
* of missing UTS/DFS, hook memcpy-based UTS/DFS.
*/
-if (0) {
pExa-UploadToScreen = TcxUploadToScreen;
pExa-DownloadFromScreen = TcxDownloadFromScreen;
-}
+
return exaDriverInit(pScreen, pExa);
}
