PERFORCE change 64191 for review
Marcel Moolenaar
marcel at FreeBSD.org
Wed Nov 3 20:07:14 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=64191
Change 64191 by marcel at marcel_nfs on 2004/11/04 04:07:07
IFC @64188
Affected files ...
.. //depot/projects/uart/alpha/alpha/db_trace.c#4 integrate
.. //depot/projects/uart/alpha/conf/GENERIC#5 integrate
.. //depot/projects/uart/amd64/amd64/db_trace.c#4 integrate
.. //depot/projects/uart/amd64/amd64/intr_machdep.c#2 integrate
.. //depot/projects/uart/amd64/conf/GENERIC#7 integrate
.. //depot/projects/uart/amd64/pci/pci_bus.c#7 integrate
.. //depot/projects/uart/arm/arm/db_trace.c#2 integrate
.. //depot/projects/uart/arm/conf/IQ31244#2 integrate
.. //depot/projects/uart/arm/conf/SIMICS#2 integrate
.. //depot/projects/uart/boot/forth/beastie.4th#4 integrate
.. //depot/projects/uart/conf/NOTES#18 integrate
.. //depot/projects/uart/contrib/pf/net/pf_if.c#2 integrate
.. //depot/projects/uart/ddb/db_output.c#4 integrate
.. //depot/projects/uart/ddb/db_ps.c#6 integrate
.. //depot/projects/uart/ddb/db_thread.c#2 integrate
.. //depot/projects/uart/ddb/db_variables.c#3 integrate
.. //depot/projects/uart/ddb/ddb.h#4 integrate
.. //depot/projects/uart/dev/acpica/acpi_pcib_acpi.c#5 integrate
.. //depot/projects/uart/dev/acpica/acpi_timer.c#6 integrate
.. //depot/projects/uart/dev/bge/if_bge.c#12 integrate
.. //depot/projects/uart/dev/bge/if_bgereg.h#8 integrate
.. //depot/projects/uart/dev/em/if_em.c#8 integrate
.. //depot/projects/uart/dev/fdc/fdc.c#3 integrate
.. //depot/projects/uart/dev/pci/pci.c#13 integrate
.. //depot/projects/uart/dev/random/randomdev_soft.c#2 integrate
.. //depot/projects/uart/dev/usb/ehci.c#5 integrate
.. //depot/projects/uart/dev/usb/ehcireg.h#3 integrate
.. //depot/projects/uart/dev/usb/ehcivar.h#3 integrate
.. //depot/projects/uart/dev/usb/uftdi.c#6 integrate
.. //depot/projects/uart/dev/usb/uhub.c#6 integrate
.. //depot/projects/uart/dev/usb/usb_subr.c#7 integrate
.. //depot/projects/uart/dev/usb/usbdevs#10 integrate
.. //depot/projects/uart/dev/usb/usbdivar.h#6 integrate
.. //depot/projects/uart/fs/ntfs/ntfs.h#4 integrate
.. //depot/projects/uart/fs/ntfs/ntfs_subr.c#5 integrate
.. //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#7 integrate
.. //depot/projects/uart/geom/geom_mbr.c#5 integrate
.. //depot/projects/uart/geom/geom_slice.c#3 integrate
.. //depot/projects/uart/i386/acpica/acpi_asus.c#2 integrate
.. //depot/projects/uart/i386/conf/GENERIC#6 integrate
.. //depot/projects/uart/i386/i386/busdma_machdep.c#9 integrate
.. //depot/projects/uart/i386/i386/db_trace.c#4 integrate
.. //depot/projects/uart/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/uart/i386/i386/machdep.c#9 integrate
.. //depot/projects/uart/i386/i386/mp_machdep.c#10 integrate
.. //depot/projects/uart/i386/pci/pci_bus.c#6 integrate
.. //depot/projects/uart/ia64/ia64/db_trace.c#5 integrate
.. //depot/projects/uart/isa/vga_isa.c#4 integrate
.. //depot/projects/uart/kern/imgact_shell.c#2 integrate
.. //depot/projects/uart/kern/kern_environment.c#3 integrate
.. //depot/projects/uart/kern/kern_intr.c#4 integrate
.. //depot/projects/uart/kern/kern_ktr.c#7 integrate
.. //depot/projects/uart/kern/kern_mac.c#7 integrate
.. //depot/projects/uart/kern/kern_subr.c#4 integrate
.. //depot/projects/uart/kern/sched_ule.c#9 integrate
.. //depot/projects/uart/kern/subr_bus.c#6 integrate
.. //depot/projects/uart/kern/tty.c#3 integrate
.. //depot/projects/uart/kern/uipc_jumbo.c#3 integrate
.. //depot/projects/uart/kern/uipc_socket.c#6 integrate
.. //depot/projects/uart/kern/uipc_syscalls.c#6 integrate
.. //depot/projects/uart/kern/vfs_bio.c#11 integrate
.. //depot/projects/uart/kern/vfs_subr.c#8 integrate
.. //depot/projects/uart/net/if.c#7 integrate
.. //depot/projects/uart/net/if_tap.c#3 integrate
.. //depot/projects/uart/net/if_tun.c#4 integrate
.. //depot/projects/uart/net/if_var.h#4 integrate
.. //depot/projects/uart/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate
.. //depot/projects/uart/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate
.. //depot/projects/uart/netgraph/bluetooth/hci/ng_hci_misc.c#4 integrate
.. //depot/projects/uart/netgraph/bluetooth/hci/ng_hci_var.h#3 integrate
.. //depot/projects/uart/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#4 integrate
.. //depot/projects/uart/netgraph/bluetooth/l2cap/ng_l2cap_var.h#3 integrate
.. //depot/projects/uart/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/uart/netgraph/netgraph.h#3 integrate
.. //depot/projects/uart/netgraph/ng_base.c#3 integrate
.. //depot/projects/uart/netgraph/ng_cisco.c#3 integrate
.. //depot/projects/uart/netgraph/ng_device.c#4 integrate
.. //depot/projects/uart/netgraph/ng_pppoe.c#4 integrate
.. //depot/projects/uart/netgraph/ng_source.c#3 integrate
.. //depot/projects/uart/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/uart/netinet/ip_fw2.c#10 integrate
.. //depot/projects/uart/netinet/tcp.h#3 integrate
.. //depot/projects/uart/netinet/tcp_hostcache.c#2 integrate
.. //depot/projects/uart/netinet/tcp_input.c#6 integrate
.. //depot/projects/uart/netinet/tcp_output.c#4 integrate
.. //depot/projects/uart/netinet/tcp_seq.h#4 integrate
.. //depot/projects/uart/netinet/tcp_subr.c#5 integrate
.. //depot/projects/uart/netinet/tcp_syncache.c#6 integrate
.. //depot/projects/uart/netinet/tcp_timer.c#4 integrate
.. //depot/projects/uart/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/uart/netinet/tcp_var.h#4 integrate
.. //depot/projects/uart/netinet/udp_usrreq.c#6 integrate
.. //depot/projects/uart/pc98/i386/machdep.c#7 integrate
.. //depot/projects/uart/pci/if_sk.c#6 integrate
.. //depot/projects/uart/pci/if_skreg.h#4 integrate
.. //depot/projects/uart/powerpc/conf/GENERIC#3 integrate
.. //depot/projects/uart/powerpc/include/elf.h#3 integrate
.. //depot/projects/uart/powerpc/powermac/ata_kauai.c#2 integrate
.. //depot/projects/uart/powerpc/powermac/ata_macio.c#4 integrate
.. //depot/projects/uart/powerpc/powerpc/db_trace.c#3 integrate
.. //depot/projects/uart/sparc64/conf/GENERIC#7 integrate
.. //depot/projects/uart/sparc64/sparc64/db_trace.c#4 integrate
.. //depot/projects/uart/sparc64/sparc64/pmap.c#13 integrate
.. //depot/projects/uart/sys/buf.h#7 integrate
.. //depot/projects/uart/sys/kernel.h#6 integrate
.. //depot/projects/uart/sys/systm.h#7 integrate
.. //depot/projects/uart/sys/ttydefaults.h#3 integrate
.. //depot/projects/uart/vm/vm_contig.c#9 integrate
.. //depot/projects/uart/vm/vm_glue.c#8 integrate
.. //depot/projects/uart/vm/vm_object.c#9 integrate
.. //depot/projects/uart/vm/vm_page.c#11 integrate
.. //depot/projects/uart/vm/vm_pageout.c#12 integrate
.. //depot/projects/uart/vm/vm_zeroidle.c#4 integrate
Differences ...
==== //depot/projects/uart/alpha/alpha/db_trace.c#4 (text+ko) ====
@@ -42,7 +42,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
/*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.21 2004/09/20 19:05:31 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -221,7 +221,7 @@
last_ipl = ~0L;
tf = NULL;
quit = 0;
- db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE);
+ db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
while (count-- && !quit) {
sym = db_search_symbol(pc, DB_STGY_ANY, &diff);
if (sym == DB_SYM_NULL)
==== //depot/projects/uart/alpha/conf/GENERIC#5 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.179 2004/09/11 07:26:50 alc Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.180 2004/11/02 20:57:19 andre Exp $
machine alpha
cpu EV4
@@ -66,7 +66,7 @@
options GEOM_GPT #GUID Partition Tables.
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options COMPAT_FREEBSD4 #Compatible with FreeBSD4
-options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
+options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
options KTRACE #ktrace(1) syscall trace support
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
==== //depot/projects/uart/amd64/amd64/db_trace.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.63 2004/09/20 19:05:31 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.64 2004/11/01 22:15:13 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -381,7 +381,7 @@
first = TRUE;
quit = 0;
- db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE);
+ db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
while (count-- && !quit) {
sym = db_search_symbol(pc, DB_STGY_ANY, &offset);
db_symbol_values(sym, &name, NULL);
==== //depot/projects/uart/amd64/amd64/intr_machdep.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.11 2004/11/03 18:03:06 scottl Exp $
*/
/*
@@ -166,8 +166,8 @@
* argument for counting hardware interrupts when they're
* processed too.
*/
- atomic_add_long(isrc->is_count, 1);
- atomic_add_int(&cnt.v_intr, 1);
+ (*isrc->is_count)++;
+ cnt.v_intr++;
it = isrc->is_ithread;
if (it == NULL)
@@ -219,7 +219,7 @@
error = ithread_schedule(it);
}
if (error == EINVAL) {
- atomic_add_long(isrc->is_straycount, 1);
+ (*isrc->is_straycount)++;
if (*isrc->is_straycount < MAX_STRAY_LOG)
log(LOG_ERR, "stray irq%d\n", vector);
else if (*isrc->is_straycount == MAX_STRAY_LOG)
@@ -313,7 +313,7 @@
else
verbose = 0;
isrc = interrupt_sources;
- db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE);
+ db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++)
if (*isrc != NULL)
db_dump_ithread((*isrc)->is_ithread, verbose);
==== //depot/projects/uart/amd64/conf/GENERIC#7 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.425 2004/09/22 00:44:13 peter Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.426 2004/11/02 20:57:19 andre Exp $
machine amd64
cpu HAMMER
@@ -48,7 +48,7 @@
options GEOM_GPT # GUID Partition Tables.
options COMPAT_IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
-options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI
+options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
options SYSVMSG # SYSV-style message queues
==== //depot/projects/uart/amd64/pci/pci_bus.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.110 2004/10/11 21:51:27 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.112 2004/10/31 15:50:32 des Exp $");
#include "opt_cpu.h"
@@ -117,7 +117,7 @@
* via some other means. If we have, bail since otherwise
* we're going to end up duplicating it.
*/
- if ((pci_devclass = devclass_find("pci")) &&
+ if ((pci_devclass = devclass_find("pci")) &&
devclass_get_device(pci_devclass, 0))
return;
@@ -136,7 +136,7 @@
*/
if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE)
continue;
- if ((hdrtype & PCIM_MFDEV) &&
+ if ((hdrtype & PCIM_MFDEV) &&
(!found_orion || hdrtype != 0xff))
pcifunchigh = PCI_FUNCMAX;
else
@@ -266,10 +266,9 @@
SYSCTL_DECL(_hw_pci);
-static int legacy_host_mem_start = 0x80000000;
-/* No TUNABLE_ULONG :-( */
-TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start);
-SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN,
+static unsigned long legacy_host_mem_start = 0x80000000;
+TUNABLE_ULONG("hw.pci.host_mem_start", &legacy_host_mem_start);
+SYSCTL_ULONG(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN,
&legacy_host_mem_start, 0x80000000,
"Limit the host bridge memory to being above this address. Must be\n\
set at boot via a tunable.");
@@ -394,12 +393,12 @@
/*
* Install placeholder to claim the resources owned by the
- * PCI bus interface. This could be used to extract the
+ * PCI bus interface. This could be used to extract the
* config space registers in the extreme case where the PnP
* ID is available and the PCI BIOS isn't, but for now we just
* eat the PnP ID and do nothing else.
*
- * XXX we should silence this probe, as it will generally confuse
+ * XXX we should silence this probe, as it will generally confuse
* people.
*/
static struct isa_pnp_id pcibus_pnp_ids[] = {
@@ -411,7 +410,7 @@
pcibus_pnp_probe(device_t dev)
{
int result;
-
+
if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, pcibus_pnp_ids)) <= 0)
device_quiet(dev);
return(result);
==== //depot/projects/uart/arm/arm/db_trace.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.6 2004/09/23 22:02:59 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.7 2004/11/01 22:15:13 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -138,7 +138,7 @@
scp_offset = -(get_pc_str_offset() >> 2);
quit = 0;
- db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE);
+ db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
while (count-- && frame != NULL && !quit) {
db_addr_t scp;
u_int32_t savecode;
==== //depot/projects/uart/arm/conf/IQ31244#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.2 2004/10/01 16:51:37 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.3 2004/11/02 20:57:19 andre Exp $
machine arm
ident IQ31244
@@ -50,7 +50,7 @@
#options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
-options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
+options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
options KTRACE #ktrace(1) support
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
==== //depot/projects/uart/arm/conf/SIMICS#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.4 2004/10/11 14:42:06 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.5 2004/11/02 20:57:19 andre Exp $
machine arm
ident SIMICS
@@ -50,7 +50,7 @@
#options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
-options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
+options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
#options KTRACE #ktrace(1) support
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
==== //depot/projects/uart/boot/forth/beastie.4th#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/forth/beastie.4th,v 1.8 2004/01/09 19:20:47 scottl Exp $
+\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.9 2004/10/30 13:45:13 brooks Exp $
marker task-beastie.4th
@@ -40,6 +40,7 @@
variable bootkey
variable bootacpikey
+variable bootusbkey
variable bootsafekey
variable bootverbosekey
variable bootsinglekey
@@ -159,6 +160,11 @@
printmenuitem ." Boot FreeBSD in single user mode" bootsinglekey !
printmenuitem ." Boot FreeBSD with verbose logging" bootverbosekey !
printmenuitem ." Escape to loader prompt" escapekey !
+ s" arch-i386" environment? if
+ printmenuitem ." Boot FreeBSD with USB keyboard" bootusbkey !
+ else
+ -2 bootacpikey !
+ then
printmenuitem ." Reboot" rebootkey !
menuX @ 20 at-xy
." Select option, [Enter] for default"
@@ -223,6 +229,10 @@
then
0 boot
then
+ dup bootusbkey @ = if
+ s" 0x1" s" hint.atkbd.0.flags" setenv
+ 0 boot
+ then
dup bootsafekey @ = if
s" arch-i386" environment? if
s" acpi_load" unsetenv
==== //depot/projects/uart/conf/NOTES#18 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1285 2004/10/27 19:26:01 rwatson Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1286 2004/11/02 20:57:20 andre Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1050,7 +1050,7 @@
options CAM_MAX_HIGHPOWER=4
options SCSI_NO_SENSE_STRINGS
options SCSI_NO_OP_STRINGS
-options SCSI_DELAY=8000 # Be pessimistic about Joe SCSI device
+options SCSI_DELAY=5000 # Be pessimistic about Joe SCSI device
# Options for the CAM CDROM driver:
# CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN
==== //depot/projects/uart/contrib/pf/net/pf_if.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.6 2004/09/14 15:20:24 mlaier Exp $ */
+/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.7 2004/11/03 17:21:12 mlaier Exp $ */
/* $OpenBSD: pf_if.c,v 1.11 2004/03/15 11:38:23 cedric Exp $ */
/* add $OpenBSD: pf_if.c,v 1.19 2004/08/11 12:06:44 henning Exp $ */
@@ -157,12 +157,11 @@
#ifdef __FreeBSD__
PF_LOCK();
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link)
- if (ifp->if_dunit != IF_DUNIT_NONE) {
- IFNET_RUNLOCK();
- pfi_attach_ifnet(ifp);
- IFNET_RLOCK();
- }
+ TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ IFNET_RUNLOCK();
+ pfi_attach_ifnet(ifp);
+ IFNET_RLOCK();
+ }
IFNET_RUNLOCK();
PF_UNLOCK();
pfi_dummy = pfi_if_create("notyet", pfi_self,
@@ -248,8 +247,7 @@
pfi_attach_ifnet_event(void *arg __unused, struct ifnet *ifp)
{
PF_LOCK();
- if (ifp->if_dunit != IF_DUNIT_NONE)
- pfi_attach_ifnet(ifp);
+ pfi_attach_ifnet(ifp);
PF_UNLOCK();
}
@@ -341,8 +339,8 @@
/* add/modify interface */
if (p == NULL)
- p = pfi_if_create(ifp->if_xname, q,
- realname?PFI_IFLAG_INSTANCE:PFI_IFLAG_PLACEHOLDER);
+ p = pfi_if_create(ifp->if_xname, q, PFI_IFLAG_INSTANCE |
+ (realname?0:PFI_IFLAG_PLACEHOLDER));
else {
/* remove from the dummy group */
/* XXX: copy stats? We should not have any!!! */
@@ -354,10 +352,9 @@
q->pfik_addcnt++;
TAILQ_INSERT_TAIL(&q->pfik_grouphead, p,
pfik_instances);
- if (realname) {
+ if (realname)
p->pfik_flags &= ~PFI_IFLAG_PLACEHOLDER;
- p->pfik_flags |= PFI_IFLAG_INSTANCE;
- }
+ p->pfik_flags |= PFI_IFLAG_INSTANCE;
}
if (p == NULL)
panic("pfi_attach_ifnet: "
@@ -874,6 +871,7 @@
if (p->pfik_rules > 0 || p->pfik_states > 0) {
/* move back to the dummy group */
p->pfik_parent = pfi_dummy;
+ p->pfik_flags &= ~PFI_IFLAG_INSTANCE;
pfi_dummy->pfik_addcnt++;
TAILQ_INSERT_TAIL(&pfi_dummy->pfik_grouphead, p,
pfik_instances);
@@ -912,11 +910,8 @@
*/
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
- if (ifp->if_dunit == IF_DUNIT_NONE)
- continue;
+ TAILQ_FOREACH(ifp, &ifnet, if_link)
pfi_newgroup(ifp->if_dname, PFI_IFLAG_DYNAMIC);
- }
IFNET_RUNLOCK();
#else
char *buses[] = PFI_DYNAMIC_BUSES;
==== //depot/projects/uart/ddb/db_output.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.31 2004/07/10 23:47:18 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.32 2004/11/01 22:15:14 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,8 +65,9 @@
#define NEXT_TAB(i) \
((((i) + db_tab_stop_width) / db_tab_stop_width) * db_tab_stop_width)
db_expr_t db_max_width = 79; /* output line width */
+db_expr_t db_lines_per_page = 20; /* lines per page */
static int db_newlines; /* # lines this page */
-static int db_maxlines = -1; /* max lines per page */
+static int db_maxlines = -1; /* max lines/page when paging */
static db_page_calloutfcn_t *db_page_callout = NULL;
static void *db_page_callout_arg = NULL;
static int ddb_use_printf = 0;
@@ -143,6 +144,7 @@
}
else if (c == '\n') {
/* Newline */
+ db_force_whitespace();
cnputc(c);
db_output_position = 0;
db_last_non_space = 0;
@@ -157,6 +159,7 @@
}
else if (c == '\r') {
/* Return */
+ db_force_whitespace();
cnputc(c);
db_output_position = 0;
db_last_non_space = 0;
@@ -197,21 +200,33 @@
void
db_simple_pager(void *arg)
{
- int c;
+ int c, done;
db_printf("--More--\r");
- for (;;) {
+ done = 0;
+ while (!done) {
c = cngetc();
switch (c) {
+ case 'e':
+ case 'j':
case '\n':
/* Just one more line. */
db_setup_paging(db_simple_pager, arg, 1);
- return;
+ done++;
+ break;
+ case 'd':
+ /* Half a page. */
+ db_setup_paging(db_simple_pager, arg,
+ db_lines_per_page / 2);
+ done++;
+ break;
+ case 'f':
case ' ':
/* Another page. */
db_setup_paging(db_simple_pager, arg,
- DB_LINES_PER_PAGE);
- return;
+ db_lines_per_page);
+ done++;
+ break;
case 'q':
case 'Q':
case 'x':
@@ -219,8 +234,8 @@
/* Quit */
if (arg != NULL) {
*(int *)arg = 1;
- db_printf("\n");
- return;
+ done++;
+ break;
}
#if 0
/* FALLTHROUGH */
@@ -229,6 +244,7 @@
#endif
}
}
+ db_printf(" \r");
}
/*
==== //depot/projects/uart/ddb/db_ps.c#6 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.53 2004/09/05 02:09:52 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.54 2004/11/01 22:15:14 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@
else
p = &proc0;
- db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE);
+ db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
db_printf(" pid proc uarea uid ppid pgrp flag stat wmesg wchan cmd\n");
while (--np >= 0 && !quit) {
if (p == NULL) {
==== //depot/projects/uart/ddb/db_thread.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_thread.c,v 1.1 2004/07/10 23:47:19 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_thread.c,v 1.2 2004/11/01 22:15:14 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@
struct thread *thr;
int pager_quit;
- db_setup_paging(db_simple_pager, &pager_quit, DB_LINES_PER_PAGE);
+ db_setup_paging(db_simple_pager, &pager_quit, db_lines_per_page);
pager_quit = 0;
thr = kdb_thr_first();
==== //depot/projects/uart/ddb/db_variables.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_variables.c,v 1.21 2004/07/10 23:47:19 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_variables.c,v 1.22 2004/11/01 22:15:14 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,6 +45,7 @@
{ "maxoff", &db_maxoff, FCN_NULL },
{ "maxwidth", &db_max_width, FCN_NULL },
{ "tabstops", &db_tab_stop_width, FCN_NULL },
+ { "lines", &db_lines_per_page, FCN_NULL },
};
static struct db_variable *db_evars =
db_vars + sizeof(db_vars)/sizeof(db_vars[0]);
==== //depot/projects/uart/ddb/ddb.h#4 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ddb/ddb.h,v 1.36 2004/07/21 05:07:09 marcel Exp $
+ * $FreeBSD: src/sys/ddb/ddb.h,v 1.37 2004/11/01 22:15:14 jhb Exp $
*/
/*
@@ -39,8 +39,6 @@
#include <machine/db_machdep.h> /* type definitions */
-#define DB_LINES_PER_PAGE 20
-
typedef void db_cmdfcn_t(db_expr_t addr, boolean_t have_addr, db_expr_t count,
char *modif);
@@ -78,6 +76,7 @@
extern db_expr_t db_radix;
extern db_expr_t db_max_width;
extern db_expr_t db_tab_stop_width;
+extern db_expr_t db_lines_per_page;
struct thread;
struct vm_map;
==== //depot/projects/uart/dev/acpica/acpi_pcib_acpi.c#5 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.42 2004/10/11 21:10:23 imp Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.44 2004/10/31 15:50:32 des Exp $
*/
#include "opt_acpi.h"
#include <sys/param.h>
@@ -73,7 +73,7 @@
static int acpi_pcib_acpi_route_interrupt(device_t pcib,
device_t dev, int pin);
static struct resource *acpi_pcib_acpi_alloc_resource(device_t dev,
- device_t child, int type, int *rid,
+ device_t child, int type, int *rid,
u_long start, u_long end, u_long count,
u_int flags);
@@ -92,7 +92,7 @@
DEVMETHOD(bus_alloc_resource, acpi_pcib_acpi_alloc_resource),
DEVMETHOD(bus_release_resource, bus_generic_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
- DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
+ DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
@@ -147,7 +147,7 @@
* Get our base bus number by evaluating _BBN.
* If this doesn't work, we assume we're bus number 0.
*
- * XXX note that it may also not exist in the case where we are
+ * XXX note that it may also not exist in the case where we are
* meant to use a private configuration space mechanism for this bus,
* so we should dig out our resources and check to see if we have
* anything like that. How do we do this?
@@ -264,7 +264,7 @@
static int
acpi_pcib_write_ivar(device_t dev, device_t child, int which, uintptr_t value)
{
- struct acpi_hpcib_softc *sc = device_get_softc(dev);
+ struct acpi_hpcib_softc *sc = device_get_softc(dev);
switch (which) {
case PCIB_IVAR_BUS:
@@ -301,8 +301,8 @@
return (acpi_pcib_route_interrupt(pcib, dev, pin));
}
-static int acpi_host_mem_start = 0x80000000;
-TUNABLE_INT("hw.acpi.host_mem_start", &acpi_host_mem_start);
+static unsigned long acpi_host_mem_start = 0x80000000;
+TUNABLE_ULONG("hw.acpi.host_mem_start", &acpi_host_mem_start);
struct resource *
acpi_pcib_acpi_alloc_resource(device_t dev, device_t child, int type, int *rid,
==== //depot/projects/uart/dev/acpica/acpi_timer.c#6 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.36 2004/10/08 17:56:47 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.37 2004/11/03 09:09:13 phk Exp $
*/
#include "opt_acpi.h"
#include <sys/param.h>
@@ -174,8 +174,12 @@
* the timer multiple times to get a consistent value before returning.
*/
j = 0;
+ if (bootverbose)
+ printf("ACPI timer:");
for (i = 0; i < 10; i++)
j += acpi_timer_test();
+ if (bootverbose)
+ printf(" -> %d\n", j);
if (j == 10) {
acpi_timer_timecounter.tc_name = "ACPI-fast";
acpi_timer_timecounter.tc_get_timecount = acpi_timer_get_timecount;
@@ -323,11 +327,8 @@
n = 0;
else
n = 1;
- if (bootverbose) {
- printf("ACPI timer looks %s min = %d, max = %d, width = %d\n",
- n ? "GOOD" : "BAD ",
- min, max, max - min);
- }
+ if (bootverbose)
+ printf(" %d/%d", n, max-min);
return (n);
}
==== //depot/projects/uart/dev/bge/if_bge.c#12 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.76 2004/10/19 02:42:49 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.79 2004/10/30 22:59:30 des Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -51,7 +51,7 @@
*
* The BCM5700 supports the PCI v2.2 and PCI-X v1.0 standards, and will
* function in a 32-bit/64-bit 33/66Mhz bus, or a 64-bit/133Mhz bus.
- *
+ *
* The BCM5701 is a single-chip solution incorporating both the BCM5700
* MAC and a BCM5401 10/100/1000 PHY. Unlike the BCM5700, the BCM5701
* does not support external SSRAM.
@@ -409,7 +409,7 @@
htole32(BGE_ADDR_HI(segs[i].ds_addr));
d->bge_len = htole16(segs[i].ds_len);
d->bge_flags = htole16(ctx->bge_flags);
- i++;
+ i++;
if (i == nseg)
break;
BGE_INC(idx, BGE_TX_RING_CNT);
@@ -486,8 +486,8 @@
if (res.vr_id != VPD_RES_ID) {
printf("bge%d: bad VPD resource id: expected %x got %x\n",
sc->bge_unit, VPD_RES_ID, res.vr_id);
- return;
- }
+ return;
+ }
pos += sizeof(res);
sc->bge_vpd_prodname = malloc(res.vr_len + 1, M_DEVBUF, M_NOWAIT);
@@ -557,7 +557,7 @@
/* Get result. */
byte = CSR_READ_4(sc, BGE_EE_DATA);
- *dest = (byte >> ((addr % 4) * 8)) & 0xFF;
+ *dest = (byte >> ((addr % 4) * 8)) & 0xFF;
return(0);
}
@@ -752,7 +752,7 @@
&sc->bge_cdata.bge_jumbo_map);
if (error)
- return (ENOMEM);
+ return (ENOMEM);
SLIST_INIT(&sc->bge_jfree_listhead);
SLIST_INIT(&sc->bge_jinuse_listhead);
@@ -765,7 +765,7 @@
for (i = 0; i < BGE_JSLOTS; i++) {
sc->bge_cdata.bge_jslots[i] = ptr;
ptr += BGE_JLEN;
- entry = malloc(sizeof(struct bge_jpool_entry),
+ entry = malloc(sizeof(struct bge_jpool_entry),
M_DEVBUF, M_NOWAIT);
if (entry == NULL) {
bge_free_jumbo_mem(sc);
@@ -784,11 +784,11 @@
static void
bge_free_jumbo_mem(sc)
- struct bge_softc *sc;
+ struct bge_softc *sc;
{
- int i;
- struct bge_jpool_entry *entry;
-
+ int i;
+ struct bge_jpool_entry *entry;
+
for (i = 0; i < BGE_JSLOTS; i++) {
entry = SLIST_FIRST(&sc->bge_jfree_listhead);
SLIST_REMOVE_HEAD(&sc->bge_jfree_listhead, jpool_entries);
@@ -809,7 +809,7 @@
if (sc->bge_cdata.bge_jumbo_tag)
bus_dma_tag_destroy(sc->bge_cdata.bge_jumbo_tag);
- return;
+ return;
}
/*
@@ -820,9 +820,9 @@
struct bge_softc *sc;
{
struct bge_jpool_entry *entry;
-
+
entry = SLIST_FIRST(&sc->bge_jfree_listhead);
-
+
if (entry == NULL) {
printf("bge%d: no free jumbo buffers\n", sc->bge_unit);
return(NULL);
@@ -1287,9 +1287,9 @@
#ifdef __brokenalpha__
/*
* Must insure that we do not cross an 8K (bytes) boundary
- * for DMA reads. Our highest limit is 1K bytes. This is a
- * restriction on some ALPHA platforms with early revision
- * 21174 PCI chipsets, such as the AlphaPC 164lx
+ * for DMA reads. Our highest limit is 1K bytes. This is a
+ * restriction on some ALPHA platforms with early revision
+ * 21174 PCI chipsets, such as the AlphaPC 164lx
*/
PCI_SETBIT(sc->bge_dev, BGE_PCI_DMA_RW_CTL,
BGE_PCI_READ_BNDRY_1024BYTES, 4);
@@ -1653,7 +1653,7 @@
/* Turn on write DMA state machine */
CSR_WRITE_4(sc, BGE_WDMA_MODE,
BGE_WDMAMODE_ENABLE|BGE_WDMAMODE_ALL_ATTNS);
-
+
/* Turn on read DMA state machine */
CSR_WRITE_4(sc, BGE_RDMA_MODE,
BGE_RDMAMODE_ENABLE|BGE_RDMAMODE_ALL_ATTNS);
@@ -1700,7 +1700,7 @@
/* Enable PHY auto polling (for MII/GMII only) */
if (sc->bge_tbi) {
CSR_WRITE_4(sc, BGE_MI_STS, BGE_MISTS_LINK);
- } else {
+ } else {
BGE_SETBIT(sc, BGE_MI_MODE, BGE_MIMODE_AUTOPOLL|10<<16);
if (sc->bge_asicrev == BGE_ASICREV_BCM5700)
CSR_WRITE_4(sc, BGE_MAC_EVT_ENB,
@@ -1927,7 +1927,7 @@
NULL, NULL, /* filter, filterarg */
MAXBSIZE, BGE_NSEG_NEW, /* maxsize, nsegments */
BUS_SPACE_MAXSIZE_32BIT,/* maxsegsize */
- BUS_DMA_ALLOCNOW, /* flags */
+ BUS_DMA_ALLOCNOW, /* flags */
NULL, NULL, /* lockfunc, lockarg */
&sc->bge_cdata.bge_parent_tag);
@@ -1984,10 +1984,10 @@
error = bus_dmamem_alloc(sc->bge_cdata.bge_rx_std_ring_tag,
(void **)&sc->bge_ldata.bge_rx_std_ring, BUS_DMA_NOWAIT,
&sc->bge_cdata.bge_rx_std_ring_map);
- if (error)
- return (ENOMEM);
+ if (error)
+ return (ENOMEM);
- bzero((char *)sc->bge_ldata.bge_rx_std_ring, BGE_STD_RX_RING_SZ);
+ bzero((char *)sc->bge_ldata.bge_rx_std_ring, BGE_STD_RX_RING_SZ);
/* Load the address of the standard RX ring */
@@ -2102,10 +2102,10 @@
error = bus_dmamem_alloc(sc->bge_cdata.bge_rx_return_ring_tag,
(void **)&sc->bge_ldata.bge_rx_return_ring, BUS_DMA_NOWAIT,
&sc->bge_cdata.bge_rx_return_ring_map);
- if (error)
- return (ENOMEM);
+ if (error)
+ return (ENOMEM);
- bzero((char *)sc->bge_ldata.bge_rx_return_ring,
+ bzero((char *)sc->bge_ldata.bge_rx_return_ring,
BGE_RX_RTN_RING_SZ(sc));
/* Load the address of the RX return ring */
@@ -2140,10 +2140,10 @@
error = bus_dmamem_alloc(sc->bge_cdata.bge_tx_ring_tag,
(void **)&sc->bge_ldata.bge_tx_ring, BUS_DMA_NOWAIT,
&sc->bge_cdata.bge_tx_ring_map);
- if (error)
- return (ENOMEM);
+ if (error)
+ return (ENOMEM);
- bzero((char *)sc->bge_ldata.bge_tx_ring, BGE_TX_RING_SZ);
+ bzero((char *)sc->bge_ldata.bge_tx_ring, BGE_TX_RING_SZ);
/* Load the address of the TX ring */
@@ -2176,10 +2176,10 @@
error = bus_dmamem_alloc(sc->bge_cdata.bge_status_tag,
(void **)&sc->bge_ldata.bge_status_block, BUS_DMA_NOWAIT,
&sc->bge_cdata.bge_status_map);
- if (error)
- return (ENOMEM);
+ if (error)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list