PERFORCE change 97041 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat May 13 00:12:19 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=97041
Change 97041 by marcel at marcel_nfs on 2006/05/13 00:11:37
IFC @97039
Affected files ...
.. //depot/projects/uart/boot/Makefile#7 integrate
.. //depot/projects/uart/boot/common/Makefile.inc#3 integrate
.. //depot/projects/uart/boot/common/load_elf.c#5 integrate
.. //depot/projects/uart/boot/common/loader.8#9 integrate
.. //depot/projects/uart/boot/efi/libefi/bootinfo.c#5 integrate
.. //depot/projects/uart/boot/ficl/Makefile#6 integrate
.. //depot/projects/uart/boot/ficl/alpha/sysdep.c#2 delete
.. //depot/projects/uart/boot/ficl/alpha/sysdep.h#2 delete
.. //depot/projects/uart/boot/ficl/loader.c#4 integrate
.. //depot/projects/uart/boot/forth/loader.4th#2 integrate
.. //depot/projects/uart/boot/ia64/ski/bootinfo.c#4 integrate
.. //depot/projects/uart/boot/ia64/ski/conf.c#3 integrate
.. //depot/projects/uart/boot/powerpc/loader/conf.c#3 integrate
.. //depot/projects/uart/compat/linprocfs/linprocfs.c#16 integrate
.. //depot/projects/uart/conf/NOTES#37 integrate
.. //depot/projects/uart/conf/files#68 integrate
.. //depot/projects/uart/conf/kern.post.mk#13 integrate
.. //depot/projects/uart/conf/options#35 integrate
.. //depot/projects/uart/contrib/pf/net/pf_ioctl.c#8 integrate
.. //depot/projects/uart/dev/asr/asr.c#12 integrate
.. //depot/projects/uart/dev/ata/ata-all.c#22 integrate
.. //depot/projects/uart/dev/ata/ata-pci.c#14 integrate
.. //depot/projects/uart/dev/atkbdc/atkbd.c#3 integrate
.. //depot/projects/uart/dev/atkbdc/atkbdc.c#4 integrate
.. //depot/projects/uart/dev/dc/if_dc.c#5 integrate
.. //depot/projects/uart/dev/de/if_de.c#2 integrate
.. //depot/projects/uart/dev/fb/tga.c#7 delete
.. //depot/projects/uart/dev/fb/tga.h#3 delete
.. //depot/projects/uart/dev/lge/if_lgereg.h#5 integrate
.. //depot/projects/uart/dev/nge/if_ngereg.h#6 integrate
.. //depot/projects/uart/dev/pdq/pdq_freebsd.h#6 integrate
.. //depot/projects/uart/dev/pdq/pdqvar.h#4 integrate
.. //depot/projects/uart/dev/ppc/ppc.c#11 integrate
.. //depot/projects/uart/dev/sound/isa/es1888.c#4 delete
.. //depot/projects/uart/dev/sound/isa/gusc.c#4 integrate
.. //depot/projects/uart/dev/sym/sym_hipd.c#11 integrate
.. //depot/projects/uart/dev/syscons/scterm-sc.c#6 integrate
.. //depot/projects/uart/dev/syscons/scvgarndr.c#7 integrate
.. //depot/projects/uart/dev/syscons/syscons.h#7 integrate
.. //depot/projects/uart/dev/uart/uart_dev_z8530.c#31 integrate
.. //depot/projects/uart/isa/isa_common.c#8 integrate
.. //depot/projects/uart/isa/isa_common.h#3 integrate
.. //depot/projects/uart/kern/init_main.c#14 integrate
.. //depot/projects/uart/kern/kern_mutex.c#12 integrate
.. //depot/projects/uart/kern/kern_sig.c#30 integrate
.. //depot/projects/uart/kern/vfs_subr.c#30 integrate
.. //depot/projects/uart/modules/ip6fw/Makefile#2 delete
.. //depot/projects/uart/modules/sound/driver/ess/Makefile#2 integrate
.. //depot/projects/uart/net/if.h#11 integrate
.. //depot/projects/uart/net/if_loop.c#8 integrate
.. //depot/projects/uart/netinet/ip_fw.h#12 integrate
.. //depot/projects/uart/netinet/ip_fw2.c#21 integrate
.. //depot/projects/uart/netinet/ip_fw_pfil.c#7 integrate
.. //depot/projects/uart/netinet/ip_input.c#17 integrate
.. //depot/projects/uart/netinet6/ip6_fw.c#8 delete
.. //depot/projects/uart/netinet6/ip6_fw.h#5 delete
.. //depot/projects/uart/pci/agp.c#5 integrate
.. //depot/projects/uart/pci/if_pcnreg.h#5 integrate
.. //depot/projects/uart/pci/if_sfreg.h#7 integrate
.. //depot/projects/uart/pci/if_stereg.h#5 integrate
.. //depot/projects/uart/pci/if_tl.c#9 integrate
.. //depot/projects/uart/pci/if_tlreg.h#6 integrate
.. //depot/projects/uart/pci/if_vrreg.h#6 integrate
.. //depot/projects/uart/pci/if_wbreg.h#6 integrate
.. //depot/projects/uart/pci/ncr.c#8 integrate
.. //depot/projects/uart/sys/_timeval.h#3 integrate
.. //depot/projects/uart/sys/conf.h#13 integrate
.. //depot/projects/uart/sys/disklabel.h#5 integrate
.. //depot/projects/uart/sys/elf64.h#3 integrate
.. //depot/projects/uart/sys/param.h#25 integrate
.. //depot/projects/uart/sys/signal.h#5 integrate
.. //depot/projects/uart/sys/ucontext.h#3 integrate
.. //depot/projects/uart/sys/user.h#8 integrate
Differences ...
==== //depot/projects/uart/boot/Makefile#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/Makefile,v 1.27 2006/03/17 18:54:34 ru Exp $
+# $FreeBSD: src/sys/boot/Makefile,v 1.28 2006/05/12 04:09:52 jhb Exp $
.include <bsd.own.mk>
@@ -20,10 +20,4 @@
# Pick the machine-dependent subdir based on the target architecture.
SUBDIR+= ${MACHINE:S/amd64/i386/}
-# Build ARC / AlphaBIOS executable on the Alpha
-# (this is a WIP (work in progress)).
-#.if ${MACHINE_ARCH} == "alpha"
-#SUBDIR+= arc
-#.endif
-
.include <bsd.subdir.mk>
==== //depot/projects/uart/boot/common/Makefile.inc#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.21 2004/10/24 12:32:41 ru Exp $
+# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.22 2006/05/12 04:09:52 jhb Exp $
SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c
SRCS+= interp_backslash.c interp_parse.c ls.c misc.c
@@ -11,8 +11,7 @@
SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c
.elif ${MACHINE_ARCH} == "powerpc"
SRCS+= load_elf32.c reloc_elf32.c
-.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" || \
- ${MACHINE_ARCH} == "alpha"
+.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64"
SRCS+= load_elf64.c reloc_elf64.c
.endif
==== //depot/projects/uart/boot/common/load_elf.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.33 2005/12/18 04:52:35 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.34 2006/05/12 04:09:52 jhb Exp $");
#include <sys/param.h>
#include <sys/exec.h>
@@ -266,7 +266,7 @@
off = - (off & 0xff000000u); /* i386 relocates after locore */
#endif
#else
- off = 0; /* alpha is direct mapped for kernels */
+ off = 0; /* other archs use direct mapped kernels */
#endif
}
ef->off = off;
==== //depot/projects/uart/boot/common/loader.8#9 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.84 2005/09/22 15:06:57 ru Exp $
+.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.85 2006/05/12 04:09:52 jhb Exp $
.\"
.Dd September 22, 2005
.Dt LOADER 8
@@ -800,9 +800,6 @@
.It arch-i386
.Ic TRUE
if the architecture is IA32.
-.It arch-alpha
-.Ic TRUE
-if the architecture is AXP.
.It FreeBSD_version
.Fx
version at compile time.
==== //depot/projects/uart/boot/efi/libefi/bootinfo.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.12 2005/09/22 15:06:57 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.13 2006/05/12 04:09:53 jhb Exp $");
#include <stand.h>
#include <string.h>
@@ -243,7 +243,7 @@
}
/*
- * Load the information expected by an alpha kernel.
+ * Load the information expected by the kernel.
*
* - The kernel environment is copied into kernel space.
* - Module metadata are formatted and placed in kernel space.
==== //depot/projects/uart/boot/ficl/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.42 2005/07/15 12:22:14 ache Exp $
+# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.43 2006/05/12 04:07:42 jhb Exp $
#
.PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/}
BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \
@@ -7,9 +7,6 @@
SRCS= ${BASE_SRCS} sysdep.c softcore.c
CLEANFILES= softcore.c testmain testmain.o
CFLAGS+= -ffreestanding
-.if ${MACHINE_ARCH} == "alpha"
-CFLAGS+= -mno-fp-regs -Os
-.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
CFLAGS+= -mpreferred-stack-boundary=2
CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2
==== //depot/projects/uart/boot/ficl/loader.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.11 2004/11/30 11:35:30 scottl Exp $
+ * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.12 2006/05/12 04:07:42 jhb Exp $
*/
/*******************************************************************
@@ -691,22 +691,14 @@
ficlSetEnv(pSys, "arch-pc98", FICL_TRUE);
#elif defined(__i386__)
ficlSetEnv(pSys, "arch-i386", FICL_TRUE);
- ficlSetEnv(pSys, "arch-alpha", FICL_FALSE);
- ficlSetEnv(pSys, "arch-ia64", FICL_FALSE);
- ficlSetEnv(pSys, "arch-powerpc", FICL_FALSE);
-#elif defined(__alpha__)
- ficlSetEnv(pSys, "arch-i386", FICL_FALSE);
- ficlSetEnv(pSys, "arch-alpha", FICL_TRUE);
ficlSetEnv(pSys, "arch-ia64", FICL_FALSE);
ficlSetEnv(pSys, "arch-powerpc", FICL_FALSE);
#elif defined(__ia64__)
ficlSetEnv(pSys, "arch-i386", FICL_FALSE);
- ficlSetEnv(pSys, "arch-alpha", FICL_FALSE);
ficlSetEnv(pSys, "arch-ia64", FICL_TRUE);
ficlSetEnv(pSys, "arch-powerpc", FICL_FALSE);
#elif defined(__powerpc__)
ficlSetEnv(pSys, "arch-i386", FICL_FALSE);
- ficlSetEnv(pSys, "arch-alpha", FICL_FALSE);
ficlSetEnv(pSys, "arch-ia64", FICL_FALSE);
ficlSetEnv(pSys, "arch-powerpc", FICL_TRUE);
#endif
==== //depot/projects/uart/boot/forth/loader.4th#2 (text+ko) ====
@@ -22,19 +22,7 @@
\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
\ SUCH DAMAGE.
\
-\ $FreeBSD: src/sys/boot/forth/loader.4th,v 1.24 2002/05/24 02:28:58 gordon Exp $
-
-s" arch-alpha" environment? [if] [if]
- s" loader_version" environment? [if]
- 12 < [if]
- .( Loader version 1.2+ required) cr
- abort
- [then]
- [else]
- .( Could not get loader version!) cr
- abort
- [then]
-[then] [then]
+\ $FreeBSD: src/sys/boot/forth/loader.4th,v 1.25 2006/05/12 04:09:53 jhb Exp $
s" arch-i386" environment? [if] [if]
s" loader_version" environment? [if]
==== //depot/projects/uart/boot/ia64/ski/bootinfo.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/bootinfo.c,v 1.13 2005/09/22 15:06:58 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/bootinfo.c,v 1.14 2006/05/12 04:09:53 jhb Exp $");
#include <stand.h>
#include <string.h>
@@ -239,7 +239,7 @@
}
/*
- * Load the information expected by an alpha kernel.
+ * Load the information expected by the kernel.
*
* - The kernel environment is copied into kernel space.
* - Module metadata are formatted and placed in kernel space.
==== //depot/projects/uart/boot/ia64/ski/conf.c#3 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/conf.c,v 1.6 2005/01/05 22:16:58 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/conf.c,v 1.7 2006/05/12 04:09:53 jhb Exp $");
#include <stand.h>
@@ -75,7 +75,7 @@
/*
* Consoles
*
- * We don't prototype these in libalpha.h because they require
+ * We don't prototype these in libski.h because they require
* data structures from bootstrap.h as well.
*/
extern struct console ski_console;
==== //depot/projects/uart/boot/powerpc/loader/conf.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/powerpc/loader/conf.c,v 1.10 2004/01/04 23:21:18 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/loader/conf.c,v 1.11 2006/05/12 04:09:53 jhb Exp $");
#include <stand.h>
#include "bootstrap.h"
@@ -102,7 +102,7 @@
/*
* Consoles
*
- * We don't prototype these in libalpha.h because they require
+ * We don't prototype these in libofw.h because they require
* data structures from bootstrap.h as well.
*/
extern struct console ofwconsole;
==== //depot/projects/uart/compat/linprocfs/linprocfs.c#16 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.92 2006/05/05 16:10:45 ambrisko Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.93 2006/05/12 05:04:40 jhb Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -79,13 +79,6 @@
#include <machine/clock.h>
-#ifdef __alpha__
-#include <machine/alpha_cpu.h>
-#include <machine/cpuconf.h>
-#include <machine/rpb.h>
-extern int ncpus;
-#endif /* __alpha__ */
-
#if defined(__i386__) || defined(__amd64__)
#include <machine/cputypes.h>
#include <machine/md_var.h>
@@ -185,77 +178,6 @@
return (0);
}
-#ifdef __alpha__
-extern struct rpb *hwrpb;
-/*
- * Filler function for proc/cpuinfo (Alpha version)
- */
-static int
-linprocfs_docpuinfo(PFS_FILL_ARGS)
-{
- u_int64_t type, major;
- struct pcs *pcsp;
- const char *model, *sysname;
-
- static const char *cpuname[] = {
- "EV3", "EV4", "Simulate", "LCA4", "EV5", "EV45", "EV56",
- "EV6", "PCA56", "PCA57", "EV67", "EV68CB", "EV68AL"
- };
-
- pcsp = LOCATE_PCS(hwrpb, hwrpb->rpb_primary_cpu_id);
- type = pcsp->pcs_proc_type;
- major = (type & PCS_PROC_MAJOR) >> PCS_PROC_MAJORSHIFT;
- if (major < sizeof(cpuname)/sizeof(char *)) {
- model = cpuname[major - 1];
- } else {
- model = "unknown";
- }
-
- sysname = alpha_dsr_sysname();
-
- sbuf_printf(sb,
- "cpu\t\t\t: Alpha\n"
- "cpu model\t\t: %s\n"
- "cpu variation\t\t: %ld\n"
- "cpu revision\t\t: %d\n"
- "cpu serial number\t: %s\n"
- "system type\t\t: %s\n"
- "system variation\t: %s\n"
- "system revision\t\t: %d\n"
- "system serial number\t: %s\n"
- "cycle frequency [Hz]\t: %lu\n"
- "timer frequency [Hz]\t: %u\n"
- "page size [bytes]\t: %ld\n"
- "phys. address bits\t: %ld\n"
- "max. addr. space #\t: %ld\n"
- "BogoMIPS\t\t: %u.%02u\n"
- "kernel unaligned acc\t: %d (pc=%x,va=%x)\n"
- "user unaligned acc\t: %d (pc=%x,va=%x)\n"
- "platform string\t\t: %s\n"
- "cpus detected\t\t: %d\n"
- ,
- model,
- pcsp->pcs_proc_var,
- *(int *)hwrpb->rpb_revision,
- " ",
- " ",
- "0",
- 0,
- " ",
- hwrpb->rpb_cc_freq,
- hz,
- hwrpb->rpb_page_size,
- hwrpb->rpb_phys_addr_size,
- hwrpb->rpb_max_asn,
- 0, 0,
- 0, 0, 0,
- 0, 0, 0,
- sysname,
- ncpus);
- return (0);
-}
-#endif /* __alpha__ */
-
#if defined(__i386__) || defined(__amd64__)
/*
* Filler function for proc/cpuinfo (i386 & amd64 version)
==== //depot/projects/uart/conf/NOTES#37 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1361 2006/05/11 22:25:26 jhb Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1362 2006/05/12 10:25:54 benno Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -2486,6 +2486,14 @@
options DEBUG_VFS_LOCKS # enable vfs lock debugging
options SOCKBUF_DEBUG # enable sockbuf last record/mb tail checking
+#
+# Verbose SYSINIT
+#
+# Make the SYSINIT process performed by mi_startup() verbose. This is very
+# useful when porting to a new architecture. If DDB is also enabled, this
+# will print function names instead of addresses.
+options VERBOSE_SYSINIT
+
#####################################################################
# SYSV IPC KERNEL PARAMETERS
#
==== //depot/projects/uart/conf/files#68 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1114 2006/05/07 18:12:17 netchild Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1115 2006/05/12 04:11:25 jhb Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -864,7 +864,6 @@
dev/sn/if_sn_pccard.c optional sn pccard
dev/snp/snp.c optional snp
dev/sound/isa/ad1816.c optional snd_ad1816 isa
-dev/sound/isa/es1888.c optional snd_ess isa
dev/sound/isa/ess.c optional snd_ess isa
dev/sound/isa/gusc.c optional snd_gusc isa
dev/sound/isa/mss.c optional snd_mss isa
==== //depot/projects/uart/conf/kern.post.mk#13 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.92 2006/02/07 13:37:26 ru Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.93 2006/05/12 02:45:12 jmg Exp $
# Part of a unified Makefile for building kernels. This part includes all
# the definitions that need to be after all the % directives except %RULES
@@ -68,6 +68,15 @@
${FULLKERNEL} ${.TARGET}
${KERNEL_KO}.symbols: ${FULLKERNEL}
${OBJCOPY} --only-keep-debug ${FULLKERNEL} ${.TARGET}
+.if defined(MFS_IMAGE)
+ @dd if="${MFS_IMAGE}" ibs=8192 of="${KERNEL_KO}" \
+ obs=`strings -at d "${KERNEL_KO}" | \
+ grep "MFS Filesystem goes here" | awk '{print $$1}'` \
+ oseek=1 conv=notrunc 2>/dev/null && \
+ strings ${KERNEL_KO} | \
+ grep 'MFS Filesystem had better STOP here' > /dev/null || \
+ (rm ${KERNEL_KO} && echo 'MFS image too large' && false)
+.endif
install.debug reinstall.debug: gdbinit
cd ${.CURDIR}; ${MAKE} ${.TARGET:R}
==== //depot/projects/uart/conf/options#35 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.540 2006/05/07 18:12:17 netchild Exp $
+# $FreeBSD: src/sys/conf/options,v 1.541 2006/05/12 02:01:38 benno Exp $
#
# On the handling of kernel options
#
@@ -158,6 +158,7 @@
TURNSTILE_PROFILING
TTYHOG opt_tty.h
VFS_AIO
+VERBOSE_SYSINIT opt_global.h
WLCACHE opt_wavelan.h
WLDEBUG opt_wavelan.h
==== //depot/projects/uart/contrib/pf/net/pf_ioctl.c#8 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.23 2006/02/05 17:17:32 mlaier Exp $ */
+/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.24 2006/05/12 16:15:34 mlaier Exp $ */
/* $OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */
/*
@@ -1479,14 +1479,20 @@
break;
}
if (pr->ticket != ruleset->rules[rs_num].inactive.ticket) {
- printf("ticket: %d != [%d]%d\n", pr->ticket,
- rs_num, ruleset->rules[rs_num].inactive.ticket);
+#ifdef __FreeBSD__
+ DPFPRINTF(PF_DEBUG_MISC,
+ ("ticket: %d != [%d]%d\n", pr->ticket, rs_num,
+ ruleset->rules[rs_num].inactive.ticket));
+#endif
error = EBUSY;
break;
}
if (pr->pool_ticket != ticket_pabuf) {
- printf("pool_ticket: %d != %d\n", pr->pool_ticket,
- ticket_pabuf);
+#ifdef __FreeBSD__
+ DPFPRINTF(PF_DEBUG_MISC,
+ ("pool_ticket: %d != %d\n", pr->pool_ticket,
+ ticket_pabuf));
+#endif
error = EBUSY;
break;
}
==== //depot/projects/uart/dev/asr/asr.c#12 (text+ko) ====
@@ -146,9 +146,6 @@
#define ASR_IOCTL_COMPAT
#endif /* ASR_COMPAT */
#endif /* !BURN_BRIDGES */
-
-#elif defined(__alpha__)
-#include <alpha/include/pmap.h>
#endif
#include <machine/vmparam.h>
@@ -165,7 +162,7 @@
#include <dev/asr/sys_info.h>
-__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.77 2006/02/12 06:57:41 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.78 2006/05/12 05:04:40 jhb Exp $");
#define ASR_VERSION 1
#define ASR_REVISION '1'
@@ -3715,8 +3712,6 @@
case CPU_686:
Info.processorType = PROC_SEXIUM; break;
}
-#elif defined(__alpha__)
- Info.processorType = PROC_ALPHA;
#endif
Info.osType = OS_BSDI_UNIX;
==== //depot/projects/uart/dev/ata/ata-all.c#22 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.272 2006/04/14 16:25:42 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.273 2006/05/12 05:04:40 jhb Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -47,9 +47,6 @@
#include <machine/resource.h>
#include <machine/bus.h>
#include <sys/rman.h>
-#ifdef __alpha__
-#include <machine/md_var.h>
-#endif
#include <dev/ata/ata-all.h>
#include <ata_if.h>
==== //depot/projects/uart/dev/ata/ata-pci.c#14 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.116 2006/02/16 17:09:24 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.117 2006/05/12 05:04:40 jhb Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -42,9 +42,6 @@
#include <machine/stdarg.h>
#include <machine/resource.h>
#include <machine/bus.h>
-#ifdef __alpha__
-#include <machine/md_var.h>
-#endif
#include <sys/rman.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
@@ -288,14 +285,10 @@
}
if (type == SYS_RES_IRQ && *rid == ATA_IRQ_RID) {
if (ata_legacy(dev)) {
-#ifdef __alpha__
- res = alpha_platform_alloc_ide_intr(unit);
-#else
int irq = (unit == 0 ? 14 : 15);
res = BUS_ALLOC_RESOURCE(device_get_parent(dev), child,
SYS_RES_IRQ, rid, irq, irq, 1, flags);
-#endif
}
else
res = controller->r_irq;
@@ -331,12 +324,8 @@
return ENOENT;
if (ata_legacy(dev)) {
-#ifdef __alpha__
- return alpha_platform_release_ide_intr(unit, r);
-#else
return BUS_RELEASE_RESOURCE(device_get_parent(dev), child,
SYS_RES_IRQ, rid, r);
-#endif
}
else
return 0;
@@ -350,13 +339,8 @@
void **cookiep)
{
if (ata_legacy(dev)) {
-#ifdef __alpha__
- return alpha_platform_setup_ide_intr(child, irq, function, argument,
- cookiep);
-#else
return BUS_SETUP_INTR(device_get_parent(dev), child, irq,
flags, function, argument, cookiep);
-#endif
}
else {
struct ata_pci_controller *controller = device_get_softc(dev);
@@ -374,11 +358,7 @@
void *cookie)
{
if (ata_legacy(dev)) {
-#ifdef __alpha__
- return alpha_platform_teardown_ide_intr(child, irq, cookie);
-#else
return BUS_TEARDOWN_INTR(device_get_parent(dev), child, irq, cookie);
-#endif
}
else {
struct ata_pci_controller *controller = device_get_softc(dev);
==== //depot/projects/uart/dev/atkbdc/atkbd.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.48 2006/04/26 06:05:16 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.49 2006/05/12 05:04:41 jhb Exp $");
#include "opt_kbd.h"
#include "opt_atkbd.h"
@@ -1330,7 +1330,7 @@
}
}
-#if defined(__alpha__) || defined(__sparc64__)
+#if defined(__sparc64__)
if (send_kbd_command_and_data(
kbdc, KBDC_SET_SCANCODE_SET, 2) != KBD_ACK) {
printf("atkbd: can't set translation.\n");
==== //depot/projects/uart/dev/atkbdc/atkbdc.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc.c,v 1.23 2006/04/26 06:05:16 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc.c,v 1.24 2006/05/12 05:04:41 jhb Exp $");
#include "opt_kbd.h"
@@ -174,8 +174,6 @@
tag = I386_BUS_SPACE_IO;
#elif defined(__amd64__)
tag = AMD64_BUS_SPACE_IO;
-#elif defined(__alpha__)
- tag = busspace_isa_io;
#elif defined(__ia64__)
tag = IA64_BUS_SPACE_IO;
#elif defined(__sparc64__)
==== //depot/projects/uart/dev/dc/if_dc.c#5 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.180 2006/03/16 20:00:39 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.181 2006/05/12 05:04:41 jhb Exp $");
/*
* DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143
@@ -128,9 +128,6 @@
#include <dev/pci/pcivar.h>
#define DC_USEIOSPACE
-#ifdef __alpha__
-#define SRM_MEDIA
-#endif
#include <dev/dc/if_dcreg.h>
@@ -2281,32 +2278,6 @@
callout_init_mtx(&sc->dc_stat_ch, &sc->dc_mtx, 0);
-#ifdef SRM_MEDIA
- sc->dc_srm_media = 0;
-
- /* Remember the SRM console media setting */
- if (DC_IS_INTEL(sc)) {
- command = pci_read_config(dev, DC_PCI_CFDD, 4);
- command &= ~(DC_CFDD_SNOOZE_MODE | DC_CFDD_SLEEP_MODE);
- switch ((command >> 8) & 0xff) {
- case 3:
- sc->dc_srm_media = IFM_10_T;
- break;
- case 4:
- sc->dc_srm_media = IFM_10_T | IFM_FDX;
- break;
- case 5:
- sc->dc_srm_media = IFM_100_TX;
- break;
- case 6:
- sc->dc_srm_media = IFM_100_TX | IFM_FDX;
- break;
- }
- if (sc->dc_srm_media)
- sc->dc_srm_media |= IFM_ACTIVE | IFM_ETHER;
- }
-#endif
-
/*
* Call MI attach routine.
*/
@@ -3400,19 +3371,7 @@
DC_LOCK(sc);
dc_init_locked(sc);
-#ifdef SRM_MEDIA
- if(sc->dc_srm_media) {
- struct ifreq ifr;
- struct mii_data *mii;
-
- ifr.ifr_media = sc->dc_srm_media;
- sc->dc_srm_media = 0;
- DC_UNLOCK(sc);
- mii = device_get_softc(sc->dc_miibus);
- ifmedia_ioctl(sc->dc_ifp, &ifr, &mii->mii_media, SIOCSIFMEDIA);
- } else
-#endif
- DC_UNLOCK(sc);
+ DC_UNLOCK(sc);
}
static void
@@ -3684,12 +3643,6 @@
case SIOCSIFMEDIA:
mii = device_get_softc(sc->dc_miibus);
error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
-#ifdef SRM_MEDIA
- DC_LOCK(sc);
- if (sc->dc_srm_media)
- sc->dc_srm_media = 0;
- DC_UNLOCK(sc);
-#endif
break;
case SIOCSIFCAP:
#ifdef DEVICE_POLLING
==== //depot/projects/uart/dev/de/if_de.c#2 (text) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/de/if_de.c,v 1.179 2006/02/26 17:52:04 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/de/if_de.c,v 1.180 2006/05/12 05:04:41 jhb Exp $");
#define TULIP_HDR_DATA
@@ -4436,15 +4436,6 @@
== TULIP_HAVE_ISVSROM ? " (invalid EESPROM checksum)" : "");
TULIP_LOCK(sc);
-#if defined(__alpha__)
- /*
- * In case the SRM console told us about a bogus media,
- * we need to check to be safe.
- */
- if (sc->tulip_mediums[sc->tulip_media] == NULL)
- sc->tulip_media = TULIP_MEDIA_UNKNOWN;
-#endif
-
(*sc->tulip_boardsw->bd_media_probe)(sc);
ifmedia_init(&sc->tulip_ifmedia, 0,
tulip_ifmedia_change,
@@ -4749,9 +4740,6 @@
tulip_pci_attach(device_t dev)
{
tulip_softc_t *sc;
-#if defined(__alpha__)
- tulip_media_t media = TULIP_MEDIA_UNKNOWN;
-#endif
int retval, idx;
u_int32_t revinfo, cfdainfo;
unsigned csroffset = TULIP_PCI_CSROFFSET;
@@ -4829,23 +4817,6 @@
pci_write_config(dev, PCI_CFDA, cfdainfo, 4);
DELAY(11*1000);
}
-#if defined(__alpha__)
- /*
- * The Alpha SRM console encodes a console set media in the driver
- * part of the CFDA register. Note that the Multia presents a
- * problem in that its BNC mode is really EXTSIA. So in that case
- * force a probe.
- */
- switch ((cfdainfo >> 8) & 0xff) {
- case 1: media = chipid > TULIP_21040 ? TULIP_MEDIA_AUI : TULIP_MEDIA_AUIBNC; break;
- case 2: media = chipid > TULIP_21040 ? TULIP_MEDIA_BNC : TULIP_MEDIA_UNKNOWN; break;
- case 3: media = TULIP_MEDIA_10BASET; break;
- case 4: media = TULIP_MEDIA_10BASET_FD; break;
- case 5: media = TULIP_MEDIA_100BASETX; break;
- case 6: media = TULIP_MEDIA_100BASETX_FD; break;
- default: media = TULIP_MEDIA_UNKNOWN; break;
- }
-#endif
sc->tulip_unit = unit;
sc->tulip_revinfo = revinfo;
@@ -4911,9 +4882,6 @@
if (sc->tulip_features & TULIP_HAVE_SHAREDINTR)
intr_rtn = tulip_intr_shared;
-#if defined(__alpha__)
- sc->tulip_media = media;
-#endif
tulip_attach(sc);
/* Setup interrupt last. */
@@ -4933,13 +4901,6 @@
return ENXIO;
}
}
-
-#if defined(__alpha__)
- TULIP_LOCK(sc);
- if (sc->tulip_media != TULIP_MEDIA_UNKNOWN)
- tulip_linkup(sc, media);
- TULIP_UNLOCK(sc);
-#endif
}
return 0;
}
==== //depot/projects/uart/dev/lge/if_lgereg.h#5 (text+ko) ====
@@ -30,7 +30,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/lge/if_lgereg.h,v 1.7 2005/11/23 18:51:34 jhb Exp $
+ * $FreeBSD: src/sys/dev/lge/if_lgereg.h,v 1.8 2006/05/12 05:04:42 jhb Exp $
*/
@@ -607,8 +607,3 @@
#define LGE_PSTATE_D3 0x0003
#define LGE_PME_EN 0x0010
#define LGE_PME_STATUS 0x8000
-
-#ifdef __alpha__
-#undef vtophys
-#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va)
-#endif
==== //depot/projects/uart/dev/nge/if_ngereg.h#6 (text+ko) ====
@@ -30,7 +30,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/nge/if_ngereg.h,v 1.14 2005/10/13 20:22:07 jhb Exp $
+ * $FreeBSD: src/sys/dev/nge/if_ngereg.h,v 1.15 2006/05/12 05:04:42 jhb Exp $
*/
#define NGE_CSR 0x00
@@ -731,8 +731,3 @@
#define NGE_PSTATE_D3 0x0003
#define NGE_PME_EN 0x0010
#define NGE_PME_STATUS 0x8000
-
-#ifdef __alpha__
-#undef vtophys
-#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va)
-#endif
==== //depot/projects/uart/dev/pdq/pdq_freebsd.h#6 (text+ko) ====
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Id: pdqvar.h,v 1.21 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD: src/sys/dev/pdq/pdq_freebsd.h,v 1.11 2005/11/11 07:36:13 ru Exp $
+ * $FreeBSD: src/sys/dev/pdq/pdq_freebsd.h,v 1.12 2006/05/12 05:04:42 jhb Exp $
*
*/
@@ -164,11 +164,7 @@
#define PDQ_OS_CSR_FMT "0x%x"
#define PDQ_OS_USEC_DELAY(n) DELAY(n)
-#ifdef __alpha__
-#define PDQ_OS_VA_TO_BUSPA(pdq, p) alpha_XXX_dmamap((vm_offset_t)p)
-#else
#define PDQ_OS_VA_TO_BUSPA(pdq, p) vtophys(p)
-#endif
#define PDQ_OS_MEMALLOC(n) malloc(n, M_DEVBUF, M_NOWAIT)
#define PDQ_OS_MEMFREE(p, n) free((void *) p, M_DEVBUF)
==== //depot/projects/uart/dev/pdq/pdqvar.h#4 (text+ko) ====
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Id: pdqvar.h,v 1.21 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.12 2005/06/10 16:49:13 brooks Exp $
+ * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.13 2006/05/12 05:04:42 jhb Exp $
*
*/
@@ -165,7 +165,7 @@
struct ifmedia sc_ifmedia;
#endif
pdq_t *sc_pdq;
-#if defined(__alpha__) || defined(__i386__)
+#if defined(__i386__)
pdq_bus_ioport_t sc_iobase;
#endif
#if defined(PDQ_IOMAPPED)
==== //depot/projects/uart/dev/ppc/ppc.c#11 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.51 2006/04/24 23:31:51 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.52 2006/05/12 05:04:42 jhb Exp $");
#include "opt_ppc.h"
@@ -1681,15 +1681,6 @@
IO_LPTSIZE_EXTENDED);
}
#endif
-#ifdef __alpha__
- /*
- * There isn't a bios list on alpha. Put it in the usual place.
- */
- if (error) {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list