Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

sync with 3.5-RELEASE.

  • Loading branch information...
commit 9d4e6e2776fe5a14c54720605f8e8fae846200ba 1 parent ff3ea22
sumikawa authored
Showing with 2,583 additions and 4,446 deletions.
  1. +0 −331 freebsd3/sys/boot/pc98/libpc98/bootinfo.c
  2. +6 −2 freebsd3/sys/conf/files
  3. +2 −2 freebsd3/sys/conf/newvers.sh
  4. +10 −2 freebsd3/sys/conf/options
  5. +0 −86 freebsd3/sys/gnu/ext2fs/ext2_fs_i.h
  6. +10 −4 freebsd3/sys/i386/conf/GENERIC
  7. +11 −5 freebsd3/sys/i386/conf/GENERIC.v6
  8. +296 −291 freebsd3/sys/i386/conf/LINT
  9. +2 −3 freebsd3/sys/i386/isa/if_ar.c
  10. +4 −1 freebsd3/sys/i386/isa/if_ed.c
  11. +130 −1 freebsd3/sys/i386/isa/if_fe.c
  12. +14 −1 freebsd3/sys/i386/isa/if_lnc.c
  13. +3 −4 freebsd3/sys/i386/isa/if_sr.c
  14. +2 −1  freebsd3/sys/i386/isa/sio.c
  15. +158 −22 freebsd3/sys/kern/uipc_mbuf.c
  16. +19 −3 freebsd3/sys/kern/uipc_socket.c
  17. +5 −1 freebsd3/sys/kern/uipc_syscalls.c
  18. +0 −86 freebsd3/sys/modules/netgraph/UI/ng_UI.8
  19. +0 −160 freebsd3/sys/modules/netgraph/async/ng_async.8
  20. +0 −143 freebsd3/sys/modules/netgraph/bpf/ng_bpf.8
  21. +0 −160 freebsd3/sys/modules/netgraph/cisco/ng_cisco.8
  22. +0 −67 freebsd3/sys/modules/netgraph/echo/ng_echo.8
  23. +0 −93 freebsd3/sys/modules/netgraph/frame_relay/ng_frame_relay.8
  24. +0 −67 freebsd3/sys/modules/netgraph/hole/ng_hole.8
  25. +0 −126 freebsd3/sys/modules/netgraph/iface/ng_iface.8
  26. +0 −178 freebsd3/sys/modules/netgraph/ksocket/ng_ksocket.8
  27. +0 −130 freebsd3/sys/modules/netgraph/lmi/ng_lmi.8
  28. +0 −379 freebsd3/sys/modules/netgraph/ppp/ng_ppp.8
  29. +0 −399 freebsd3/sys/modules/netgraph/pppoe/ng_pppoe.8
  30. +0 −136 freebsd3/sys/modules/netgraph/pptpgre/ng_pptpgre.8
  31. +0 −109 freebsd3/sys/modules/netgraph/rfc1490/ng_rfc1490.8
  32. +0 −173 freebsd3/sys/modules/netgraph/socket/ng_socket.8
  33. +0 −117 freebsd3/sys/modules/netgraph/tee/ng_tee.8
  34. +0 −131 freebsd3/sys/modules/netgraph/tty/ng_tty.8
  35. +0 −210 freebsd3/sys/modules/netgraph/vjc/ng_vjc.8
  36. +42 −44 freebsd3/sys/net/bridge.c
  37. +14 −11 freebsd3/sys/net/if.c
  38. +2 −1  freebsd3/sys/net/if_sl.c
  39. +3 −0  freebsd3/sys/net/if_tun.c
  40. +9 −1 freebsd3/sys/net/if_var.h
  41. +2 −2 freebsd3/sys/net/if_vlan.c
  42. +2 −3 freebsd3/sys/net/route.h
  43. +3 −2 freebsd3/sys/net/rtsock.c
  44. +756 −366 freebsd3/sys/netinet/ip_dummynet.c
  45. +599 −115 freebsd3/sys/netinet/ip_fw.c
  46. +1 −1  freebsd3/sys/netinet/ip_icmp.c
  47. +12 −15 freebsd3/sys/netinet/ip_input.c
  48. +12 −14 freebsd3/sys/netinet/ip_output.c
  49. +1 −13 freebsd3/sys/netinet/raw_ip.c
  50. +21 −8 freebsd3/sys/netinet/tcp_input.c
  51. +4 −1 freebsd3/sys/netinet/tcp_output.c
  52. +1 −1  freebsd3/sys/netinet/tcp_subr.c
  53. +82 −5 freebsd3/sys/pci/if_fxp.c
  54. +31 −5 freebsd3/sys/pci/if_rl.c
  55. +309 −211 freebsd3/sys/sys/mbuf.h
  56. +3 −1 freebsd3/sys/sys/socket.h
  57. +2 −2 kame/sys/netinet6/in6.h
View
331 freebsd3/sys/boot/pc98/libpc98/bootinfo.c
@@ -1,331 +0,0 @@
-/*-
- * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: bootinfo.c,v 1.1.2.1 1999/02/06 07:37:14 kato Exp $
- */
-
-#include <stand.h>
-#include <sys/param.h>
-#include <sys/reboot.h>
-#include <sys/linker.h>
-#include <machine/bootinfo.h>
-#include "bootstrap.h"
-#include "libi386.h"
-#include "btxv86.h"
-
-static struct bootinfo bi;
-#ifdef PC98
-extern struct bootinfo *initial_bootinfo;
-#endif
-
-/*
- * Return a 'boothowto' value corresponding to the kernel arguments in
- * (kargs) and any relevant environment variables.
- */
-static struct
-{
- char *ev;
- int mask;
-} howto_names[] = {
- {"boot_askname", RB_ASKNAME},
- {"boot_userconfig", RB_CONFIG},
- {"boot_ddb", RB_KDB},
- {"boot_gdb", RB_GDB},
- {"boot_single", RB_SINGLE},
- {"boot_verbose", RB_VERBOSE},
- {NULL, 0}
-};
-
-int
-bi_getboothowto(char *kargs)
-{
- char *cp;
- int howto;
- int active;
- int i;
-
- /* Parse kargs */
- howto = 0;
- if (kargs != NULL) {
- cp = kargs;
- active = 0;
- while (*cp != 0) {
- if (!active && (*cp == '-')) {
- active = 1;
- } else if (active)
- switch (*cp) {
- case 'a':
- howto |= RB_ASKNAME;
- break;
- case 'c':
- howto |= RB_CONFIG;
- break;
- case 'd':
- howto |= RB_KDB;
- break;
- case 'g':
- howto |= RB_GDB;
- break;
- case 'h':
- howto |= RB_SERIAL;
- break;
- case 'r':
- howto |= RB_DFLTROOT;
- break;
- case 's':
- howto |= RB_SINGLE;
- break;
- case 'v':
- howto |= RB_VERBOSE;
- break;
- default:
- active = 0;
- break;
- }
- cp++;
- }
- }
- /* get equivalents from the environment */
- for (i = 0; howto_names[i].ev != NULL; i++)
- if (getenv(howto_names[i].ev) != NULL)
- howto |= howto_names[i].mask;
- if (!strcmp(getenv("console"), "comconsole"))
- howto |= RB_SERIAL;
- return(howto);
-}
-
-/*
- * Copy the environment into the load area starting at (addr).
- * Each variable is formatted as <name>=<value>, with a single nul
- * separating each variable, and a double nul terminating the environment.
- */
-vm_offset_t
-bi_copyenv(vm_offset_t addr)
-{
- struct env_var *ep;
-
- /* traverse the environment */
- for (ep = environ; ep != NULL; ep = ep->ev_next) {
- i386_copyin(ep->ev_name, addr, strlen(ep->ev_name));
- addr += strlen(ep->ev_name);
- i386_copyin("=", addr, 1);
- addr++;
- if (ep->ev_value != NULL) {
- i386_copyin(ep->ev_value, addr, strlen(ep->ev_value));
- addr += strlen(ep->ev_value);
- }
- i386_copyin("", addr, 1);
- addr++;
- }
- i386_copyin("", addr, 1);
- addr++;
- return(addr);
-}
-
-/*
- * Copy module-related data into the load area, where it can be
- * used as a directory for loaded modules.
- *
- * Module data is presented in a self-describing format. Each datum
- * is preceeded by a 32-bit identifier and a 32-bit size field.
- *
- * Currently, the following data are saved:
- *
- * MOD_NAME (variable) module name (string)
- * MOD_TYPE (variable) module type (string)
- * MOD_ADDR sizeof(vm_offset_t) module load address
- * MOD_SIZE sizeof(size_t) module size
- * MOD_METADATA (variable) type-specific metadata
- */
-#define COPY32(v, a) { \
- u_int32_t x = (v); \
- i386_copyin(&x, a, sizeof(x)); \
- a += sizeof(x); \
-}
-
-#define MOD_STR(t, a, s) { \
- COPY32(t, a); \
- COPY32(strlen(s) + 1, a); \
- i386_copyin(s, a, strlen(s) + 1); \
- a += roundup(strlen(s) + 1, sizeof(u_long));\
-}
-
-#define MOD_NAME(a, s) MOD_STR(MODINFO_NAME, a, s)
-#define MOD_TYPE(a, s) MOD_STR(MODINFO_TYPE, a, s)
-
-#define MOD_VAR(t, a, s) { \
- COPY32(t, a); \
- COPY32(sizeof(s), a); \
- i386_copyin(&s, a, sizeof(s)); \
- a += roundup(sizeof(s), sizeof(u_long)); \
-}
-
-#define MOD_ADDR(a, s) MOD_VAR(MODINFO_ADDR, a, s)
-#define MOD_SIZE(a, s) MOD_VAR(MODINFO_SIZE, a, s)
-
-#define MOD_METADATA(a, mm) { \
- COPY32(MODINFO_METADATA | mm->md_type, a); \
- COPY32(mm->md_size, a); \
- i386_copyin(mm->md_data, a, mm->md_size); \
- a += roundup(mm->md_size, sizeof(u_long));\
-}
-
-#define MOD_END(a) { \
- COPY32(MODINFO_END, a); \
- COPY32(0, a); \
-}
-
-vm_offset_t
-bi_copymodules(vm_offset_t addr)
-{
- struct loaded_module *mp;
- struct module_metadata *md;
-
- /* start with the first module on the list, should be the kernel */
- for (mp = mod_findmodule(NULL, NULL); mp != NULL; mp = mp->m_next) {
-
- MOD_NAME(addr, mp->m_name); /* this field must come first */
- MOD_TYPE(addr, mp->m_type);
- MOD_ADDR(addr, mp->m_addr);
- MOD_SIZE(addr, mp->m_size);
- for (md = mp->m_metadata; md != NULL; md = md->md_next)
- if (!(md->md_type & MODINFOMD_NOCOPY))
- MOD_METADATA(addr, md);
- }
- MOD_END(addr);
- return(addr);
-}
-
-/*
- * Load the information expected by an i386 kernel.
- *
- * - The 'boothowto' argument is constructed
- * - The 'botdev' argument is constructed
- * - The 'bootinfo' struct is constructed, and copied into the kernel space.
- * - The kernel environment is copied into kernel space.
- * - Module metadata are formatted and placed in kernel space.
- */
-int
-bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip)
-{
- struct loaded_module *xp;
- struct i386_devdesc *rootdev;
- vm_offset_t addr, bootinfo_addr;
- char *rootdevname;
- int bootdevnr;
- u_int pad;
- char *kernelname;
- const char *kernelpath;
-#ifdef PC98
- int i;
-#endif
-
- *howtop = bi_getboothowto(args);
-
- /*
- * Allow the environment variable 'rootdev' to override the supplied device
- * This should perhaps go to MI code and/or have $rootdev tested/set by
- * MI code before launching the kernel.
- */
- rootdevname = getenv("rootdev");
- i386_getdev((void **)(&rootdev), rootdevname, NULL);
- if (rootdev == NULL) { /* bad $rootdev/$currdev */
- printf("can't determine root device\n");
- return(EINVAL);
- }
-
- switch(rootdev->d_type) {
- case DEVT_DISK:
- /* pass in the BIOS device number of the current disk */
- bi.bi_bios_dev = bd_unit2bios(rootdev->d_kind.biosdisk.unit);
- bootdevnr = bd_getdev(rootdev);
- if (bootdevnr != -1)
- break;
- printf("root device %s invalid\n", i386_fmtdev(rootdev));
- return(EINVAL);
-
- default:
- printf("aout_exec: WARNING - don't know how to boot from device type %d\n", rootdev->d_type);
- }
- free(rootdev);
- *bootdevp = bootdevnr;
-
- /* legacy bootinfo structure */
- bi.bi_version = BOOTINFO_VERSION;
- bi.bi_kernelname = 0; /* XXX char * -> kernel name */
- bi.bi_nfs_diskless = 0; /* struct nfs_diskless * */
- bi.bi_n_bios_used = 0; /* XXX would have to hook biosdisk driver for these */
- /* bi.bi_bios_geom[] */
-#ifdef PC98
- for(i = 0; i < N_BIOS_GEOM; i++)
- bi.bi_bios_geom[i] = initial_bootinfo->bi_bios_geom[i];
-#endif
- bi.bi_size = sizeof(bi);
- bi.bi_memsizes_valid = 1;
- bi.bi_basemem = getbasemem();
- bi.bi_extmem = getextmem();
-
- /* find the last module in the chain */
- addr = 0;
- for (xp = mod_findmodule(NULL, NULL); xp != NULL; xp = xp->m_next) {
- if (addr < (xp->m_addr + xp->m_size))
- addr = xp->m_addr + xp->m_size;
- }
- /* pad to a page boundary */
- pad = (u_int)addr & PAGE_MASK;
- if (pad != 0) {
- pad = PAGE_SIZE - pad;
- addr += pad;
- }
-
- /* copy our environment */
- bi.bi_envp = addr;
- addr = bi_copyenv(addr);
-
- /* pad to a page boundary */
- pad = (u_int)addr & PAGE_MASK;
- if (pad != 0) {
- pad = PAGE_SIZE - pad;
- addr += pad;
- }
- /* copy module list and metadata */
- bi.bi_modulep = addr;
- addr = bi_copymodules(addr);
-
- /* all done copying stuff in, save end of loaded object space */
- bi.bi_kernend = addr;
-
- *howtop |= RB_BOOTINFO; /* it's there now */
-
- /*
- * Get the kernel name, strip off any device prefix.
- */
- kernelname = getenv("kernelname");
- i386_getdev(NULL, kernelname, &kernelpath);
- bi.bi_kernelname = VTOP(kernelpath);
- *bip = VTOP(&bi);
-
- return(0);
-}
View
8 freebsd3/sys/conf/files
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.190.2.20 1999/12/08 19:46:57 julian Exp $
+# $FreeBSD: src/sys/conf/files,v 1.190.2.24 2000/04/18 13:33:02 roger Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -90,6 +90,7 @@ ddb/db_print.c optional ddb
ddb/db_ps.c optional ddb
ddb/db_run.c optional ddb
ddb/db_sym.c optional ddb
+ddb/db_sysctl.c optional ddb
ddb/db_trap.c optional ddb
ddb/db_variables.c optional ddb
ddb/db_watch.c optional ddb
@@ -109,6 +110,7 @@ dev/buslogic/bt.c optional bt device-driver
dev/ccd/ccd.c optional ccd device-driver
dev/isp/isp_freebsd.c optional isp device-driver
dev/isp/isp.c optional isp device-driver
+dev/isp/isp_target.c optional isp device-driver
#dev/dpt/dpt_control.c optional dpt device-driver
dev/dpt/dpt_scsi.c optional dpt device-driver
dev/en/midway.c optional en device-driver
@@ -167,6 +169,8 @@ smbus_if.h optional smbus \
dev/smbus/smbconf.c optional smbus
dev/smbus/smbus.c optional smbus
dev/smbus/smb.c optional smb
+dev/sym/sym_hipd.c optional sym \
+ dependency "$S/dev/sym/sym_{conf,defs}.h"
dev/iicbus/iicbb.c optional iicbb
iicbb_if.o optional iicbb \
dependency "iicbb_if.c" \
@@ -637,7 +641,7 @@ pci/adw_pci.c optional adw device-driver
pci/ahc_pci.c optional ahc device-driver \
dependency "aic7xxx_reg.h $S/pci/ahc_pci.c"
dev/bktr/bktr_core.c optional bktr device-driver
-dev/bktr/bktr_i2c.c optional bktr device-driver
+dev/bktr/bktr_i2c.c optional bktr smbus device-driver
dev/bktr/bktr_card.c optional bktr device-driver
dev/bktr/bktr_tuner.c optional bktr device-driver
dev/bktr/bktr_audio.c optional bktr device-driver
View
4 freebsd3/sys/conf/newvers.sh
@@ -32,10 +32,10 @@
# SUCH DAMAGE.
#
# @(#)newvers.sh 8.1 (Berkeley) 4/20/94
-# $FreeBSD: src/sys/conf/newvers.sh,v 1.41.2.13 1999/12/17 03:03:56 jkh Exp $
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.41.2.15 2000/06/20 16:12:53 jkh Exp $
TYPE="FreeBSD"
-REVISION="3.4"
+REVISION="3.5"
BRANCH="RELEASE"
RELEASE="${REVISION}-${BRANCH}"
SNAPDATE=""
View
12 freebsd3/sys/conf/options
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.121.2.21 1999/12/08 19:46:58 julian Exp $
+# $FreeBSD: src/sys/conf/options,v 1.121.2.25 2000/06/13 08:48:00 ru Exp $
#
# On the handling of kernel options
#
@@ -55,7 +55,6 @@ DEVFS
FAILSAFE
HW_WDOG
KTRACE
-MD5
MFS_ROOT opt_mfs.h
MFS_ROOT_SIZE opt_mfs.h
NTIMECOUNTER opt_ntp.h
@@ -179,6 +178,12 @@ SA_1FM_AT_EOD opt_sa.h
# Options used only in cam/scsi/scsi_pt.c
SCSI_PT_DEFAULT_TIMEOUT opt_pt.h
+# Options used in dev/sym/ (Symbios SCSI driver).
+SYM_SETUP_LP_PROBE_MAP opt_sym.h # Low Priority Probe Map (bits)
+SYM_SETUP_SCSI_DIFF opt_sym.h # HVD support for 825a, 875, 885
+SYM_SETUP_PCI_PARITY opt_sym.h # PCI parity checking
+SYM_SETUP_MAX_LUN opt_sym.h # Number of LUNs supported
+
# Options used only in pci/ncr.c
SCSI_NCR_DEBUG opt_ncr.h
SCSI_NCR_DFLT_TAGS opt_ncr.h
@@ -196,11 +201,13 @@ SCSI_ISP_FCDUPLEX opt_isp.h
SCSI_ISP_WWN opt_isp.h
ISP_DISABLE_1020_SUPPORT opt_isp.h
ISP_DISABLE_1080_SUPPORT opt_isp.h
+ISP_DISABLE_12160_SUPPORT opt_isp.h
ISP_DISABLE_2100_SUPPORT opt_isp.h
ISP_DISABLE_2200_SUPPORT opt_isp.h
ISP_COMPILE_FW opt_isp.h
ISP_COMPILE_1020_FW opt_isp.h
ISP_COMPILE_1080_FW opt_isp.h
+ISP_COMPILE_12160_FW opt_isp.h
ISP_COMPILE_2100_FW opt_isp.h
ISP_COMPILE_2200_FW opt_isp.h
ISP_TARGET_MODE opt_isp.h
@@ -277,6 +284,7 @@ TCP_RESTRICT_RST opt_tcp_input.h
IPFILTER opt_ipfilter.h
IPFILTER_LOG opt_ipfilter.h
IPFILTER_LKM opt_ipfilter.h
+IPFILTER_DEFAULT_BLOCK opt_ipfilter.h
PM opt_pm.h
PM_USE_SOCKET opt_pm.h
View
86 freebsd3/sys/gnu/ext2fs/ext2_fs_i.h
@@ -1,86 +0,0 @@
-/*
- * added for EXT2FS support in Lites 1.1
- *
- * Aug 1995, Godmar Back (gback@cs.utah.edu)
- * University of Utah, Department of Computer Science
- *
- * Note that this started out to be ext2_fs_i.h. In reality it
- * doesn't have anything to do with. I put the declaration of
- * the on disk ext2 format here from ext2_fs.h because this is
- * something that would name clash with other stuff.
- * This is used only in ext2_inode_cnv.c
- */
-/*
- * linux/include/linux/ext2_fs_i.h
- *
- * Copyright (C) 1992, 1993, 1994, 1995
- * Remy Card (card@masi.ibp.fr)
- * Laboratoire MASI - Institut Blaise Pascal
- * Universite Pierre et Marie Curie (Paris VI)
- *
- * from
- *
- * linux/include/linux/minix_fs_i.h
- *
- * Copyright (C) 1991, 1992 Linus Torvalds
- */
-
-#ifndef _EXT2_FS_I
-#define _EXT2_FS_I
-
-/*
- * Structure of an inode on the disk
- */
-struct ext2_inode {
- __u16 i_mode; /* File mode */
- __u16 i_uid; /* Owner Uid */
- __u32 i_size; /* Size in bytes */
- __u32 i_atime; /* Access time */
- __u32 i_ctime; /* Creation time */
- __u32 i_mtime; /* Modification time */
- __u32 i_dtime; /* Deletion Time */
- __u16 i_gid; /* Group Id */
- __u16 i_links_count; /* Links count */
- __u32 i_blocks; /* Blocks count */
- __u32 i_flags; /* File flags */
- union {
- struct {
- __u32 l_i_reserved1;
- } linux1;
- struct {
- __u32 h_i_translator;
- } hurd1;
- struct {
- __u32 m_i_reserved1;
- } masix1;
- } osd1; /* OS dependent 1 */
- __u32 i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
- __u32 i_version; /* File version (for NFS) */
- __u32 i_file_acl; /* File ACL */
- __u32 i_dir_acl; /* Directory ACL */
- __u32 i_faddr; /* Fragment address */
- union {
- struct {
- __u8 l_i_frag; /* Fragment number */
- __u8 l_i_fsize; /* Fragment size */
- __u16 i_pad1;
- __u32 l_i_reserved2[2];
- } linux2;
- struct {
- __u8 h_i_frag; /* Fragment number */
- __u8 h_i_fsize; /* Fragment size */
- __u16 h_i_mode_high;
- __u16 h_i_uid_high;
- __u16 h_i_gid_high;
- __u32 h_i_author;
- } hurd2;
- struct {
- __u8 m_i_frag; /* Fragment number */
- __u8 m_i_fsize; /* Fragment size */
- __u16 m_pad1;
- __u32 m_i_reserved2[2];
- } masix2;
- } osd2; /* OS dependent 2 */
-};
-
-#endif /* _EXT2_FS_I */
View
14 freebsd3/sys/i386/conf/GENERIC
@@ -15,7 +15,7 @@
# device lines is also present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.24 1999/12/05 01:56:42 luoqi Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.27 2000/03/01 10:51:37 nik Exp $
machine "i386"
cpu "I386_CPU"
@@ -70,7 +70,7 @@ disk fd0 at fdc0 drive 0
disk fd1 at fdc0 drive 1
# IDE controller and disks
-options "CMD640" # work around CMD640 chip deficiency
+options "CMD640" # work around CMD640 chip deficiency
controller wdc0 at isa? port "IO_WD1" bio irq 14
disk wd0 at wdc0 drive 0
disk wd1 at wdc0 drive 1
@@ -80,8 +80,8 @@ disk wd2 at wdc1 drive 0
disk wd3 at wdc1 drive 1
# ATAPI devices
-options ATAPI #Enable ATAPI support for IDE bus
-options ATAPI_STATIC #Don't do it as an LKM
+options ATAPI #Enable ATAPI support for IDE bus
+options ATAPI_STATIC #Don't do it as an LKM
device acd0 #IDE CD-ROM
device wfd0 #IDE Floppy (e.g. LS-120)
@@ -89,6 +89,7 @@ device wfd0 #IDE Floppy (e.g. LS-120)
# A single entry for any of these controllers (ncr, ahb, ahc) is
# sufficient for any number of installed devices.
controller ncr0 # NCR/Symbios Logic
+#controller sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts)
controller ahb0 # EISA AHA1742 family
controller ahc0 # AHA2940 and onboard AIC7xxx devices
controller amd0 # AMD 53C974 (Teckram DC-390(T))
@@ -153,6 +154,11 @@ device sio2 at isa? disable port "IO_COM3" tty irq 5
device sio3 at isa? disable port "IO_COM4" tty irq 9
# Parallel port
+#
+# Note: The ppc0 entry is configured to support networking over the
+# parallel port. If you will be using it for printing, change
+# "net" to "tty", and review ppc(4) to ensure you have the
+# correct flags value.
device ppc0 at isa? port? flags 0x40 net irq 7
controller ppbus0 # Parallel port bus (required)
device lpt0 at ppbus? # Printer
View
16 freebsd3/sys/i386/conf/GENERIC.v6
@@ -15,8 +15,8 @@
# device lines is also present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.24 1999/12/05 01:56:42 luoqi Exp $
-# $Id: GENERIC.v6,v 1.16 2000/05/22 15:19:47 fujisawa Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.27 2000/03/01 10:51:37 nik Exp $
+# $KAME: GENERIC.v6,v 1.17 2000/06/25 08:05:31 sumikawa Exp $
machine "i386"
cpu "I386_CPU"
@@ -125,7 +125,7 @@ disk fd0 at fdc0 drive 0
disk fd1 at fdc0 drive 1
# IDE controller and disks
-options "CMD640" # work around CMD640 chip deficiency
+options "CMD640" # work around CMD640 chip deficiency
controller wdc0 at isa? port "IO_WD1" bio irq 14
disk wd0 at wdc0 drive 0
disk wd1 at wdc0 drive 1
@@ -135,8 +135,8 @@ disk wd2 at wdc1 drive 0
disk wd3 at wdc1 drive 1
# ATAPI devices
-options ATAPI #Enable ATAPI support for IDE bus
-options ATAPI_STATIC #Don't do it as an LKM
+options ATAPI #Enable ATAPI support for IDE bus
+options ATAPI_STATIC #Don't do it as an LKM
device acd0 #IDE CD-ROM
device wfd0 #IDE Floppy (e.g. LS-120)
@@ -144,6 +144,7 @@ device wfd0 #IDE Floppy (e.g. LS-120)
# A single entry for any of these controllers (ncr, ahb, ahc) is
# sufficient for any number of installed devices.
controller ncr0 # NCR/Symbios Logic
+#controller sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts)
controller ahb0 # EISA AHA1742 family
controller ahc0 # AHA2940 and onboard AIC7xxx devices
controller amd0 # AMD 53C974 (Teckram DC-390(T))
@@ -208,6 +209,11 @@ device sio2 at isa? disable port "IO_COM3" tty irq 5
device sio3 at isa? disable port "IO_COM4" tty irq 9
# Parallel port
+#
+# Note: The ppc0 entry is configured to support networking over the
+# parallel port. If you will be using it for printing, change
+# "net" to "tty", and review ppc(4) to ensure you have the
+# correct flags value.
device ppc0 at isa? port? flags 0x40 net irq 7
controller ppbus0 # Parallel port bus (required)
device lpt0 at ppbus? # Printer
View
587 freebsd3/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $FreeBSD: src/sys/i386/conf/LINT,v 1.539.2.52 1999/12/15 19:35:13 joe Exp $
+# $FreeBSD: src/sys/i386/conf/LINT,v 1.539.2.56 2000/06/13 08:48:06 ru Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -45,17 +45,17 @@ maxusers 10
# max, and explicitly set the maximum with a shell command for processes
# that regularly exceed the limit like INND.
#
-options "MAXDSIZ=(256*1024*1024)"
-options "DFLDSIZ=(256*1024*1024)"
+options "MAXDSIZ=(256*1024*1024)"
+options "DFLDSIZ=(256*1024*1024)"
# When this is set, be extra conservative in various parts of the kernel
# and choose functionality over speed (on the widest variety of systems).
-options FAILSAFE
+options FAILSAFE
# Options for the VM subsystem
-#options PQ_NOOPT # No coloring
-options PQ_LARGECACHE # color for 512k/16k cache
-#options PQ_HUGECACHE # color for 1024k/16k cache
+#options PQ_NOOPT # No coloring
+options PQ_LARGECACHE # color for 512k/16k cache
+#options PQ_HUGECACHE # color for 1024k/16k cache
# This allows you to actually store this configuration file into
# the kernel binary itself, where it may be later read by saying:
@@ -94,14 +94,14 @@ config kernel root on wd0 dumps on wd0
#
# Mandatory:
-options SMP # Symmetric MultiProcessor Kernel
-options APIC_IO # Symmetric (APIC) I/O
+options SMP # Symmetric MultiProcessor Kernel
+options APIC_IO # Symmetric (APIC) I/O
# Optional, these are the defaults plus 1:
-options NCPU=5 # number of CPUs
-options NBUS=5 # number of busses
-options NAPIC=2 # number of IO APICs
-options NINTR=25 # number of INTs
+options NCPU=5 # number of CPUs
+options NBUS=5 # number of busses
+options NAPIC=2 # number of IO APICs
+options NINTR=25 # number of INTs
#
# Rogue SMP hardware:
@@ -200,21 +200,21 @@ cpu "I686_CPU" # aka Pentium Pro(tm)
# NOTE 3: This option may cause failures for software that requires
# locked cycles in order to operate correctly.
#
-options "CPU_BLUELIGHTNING_FPU_OP_CACHE"
-options "CPU_BLUELIGHTNING_3X"
-options "CPU_BTB_EN"
-options "CPU_DIRECT_MAPPED_CACHE"
-options "CPU_DISABLE_5X86_LSSER"
-options "CPU_FASTER_5X86_FPU"
-options "CPU_I486_ON_386"
-options "CPU_IORT"
-options "CPU_LOOP_EN"
-options "CPU_RSTK_EN"
-options "CPU_SUSP_HLT"
-options "CPU_WT_ALLOC"
-options "CYRIX_CACHE_WORKS"
-options "CYRIX_CACHE_REALLY_WORKS"
-#options "NO_F00F_HACK"
+options "CPU_BLUELIGHTNING_FPU_OP_CACHE"
+options "CPU_BLUELIGHTNING_3X"
+options "CPU_BTB_EN"
+options "CPU_DIRECT_MAPPED_CACHE"
+options "CPU_DISABLE_5X86_LSSER"
+options "CPU_FASTER_5X86_FPU"
+options "CPU_I486_ON_386"
+options "CPU_IORT"
+options "CPU_LOOP_EN"
+options "CPU_RSTK_EN"
+options "CPU_SUSP_HLT"
+options "CPU_WT_ALLOC"
+options "CYRIX_CACHE_WORKS"
+options "CYRIX_CACHE_REALLY_WORKS"
+#options "NO_F00F_HACK"
#
# A math emulator is mandatory if you wish to run on hardware which
@@ -222,9 +222,9 @@ options "CYRIX_CACHE_REALLY_WORKS"
# bogus (but freely-distributable) math emulator, or a much more
# fully-featured but GPL-licensed emulator taken from Linux.
#
-options MATH_EMULATE #Support for x87 emulation
+options MATH_EMULATE #Support for x87 emulation
# Don't enable both of these in a real config.
-options GPL_MATH_EMULATE #Support for x87 emulation via
+options GPL_MATH_EMULATE #Support for x87 emulation via
#new math emulator
@@ -236,7 +236,7 @@ options GPL_MATH_EMULATE #Support for x87 emulation via
# FreeBSD. You probably do NOT want to remove this as much current code
# still relies on the 4.3 emulation.
#
-options "COMPAT_43"
+options "COMPAT_43"
#
# Statically compile in the i386 a.out LKM compatability support.
@@ -249,29 +249,23 @@ options LKM
# This option is required for the WINE Windows(tm) emulator, and is
# not used by anything else (that we know of).
#
-options USER_LDT #allow user-level control of i386 ldt
+options USER_LDT #allow user-level control of i386 ldt
#
# These three options provide support for System V Interface
# Definition-style interprocess communication, in the form of shared
# memory, semaphores, and message queues, respectively.
#
-options SYSVSHM
-options SYSVSEM
-options SYSVMSG
-
-#
-# This option includes a MD5 routine in the kernel, this is used for
-# various authentication and privacy uses.
-#
-options "MD5"
+options SYSVSHM
+options SYSVSEM
+options SYSVMSG
#
# Allow processes to switch to vm86 mode, as well as enabling direct
# user-mode access to the I/O port space. This option is necessary for
# the doscmd emulator to run and the VESA modes in syscons to be available.
#
-options "VM86"
+options "VM86"
#####################################################################
@@ -280,14 +274,14 @@ options "VM86"
#
# Enable the kernel debugger.
#
-options DDB
+options DDB
#
# Don't drop into DDB for a panic. Intended for unattended operation
# where you may want to drop to DDB from the console, but still want
# the machine to recover from a panic
#
-options DDB_UNATTENDED
+options DDB_UNATTENDED
#
# If using GDB remote mode to debug the kernel, there's a non-standard
@@ -296,12 +290,12 @@ options DDB_UNATTENDED
# standard and you're on your own if you enable it. See also the
# "remotechat" variables in the FreeBSD specific version of gdb.
#
-options GDB_REMOTE_CHAT
+options GDB_REMOTE_CHAT
#
# KTRACE enables the system-call tracing facility ktrace(2).
#
-options KTRACE #kernel tracing
+options KTRACE #kernel tracing
#
# The INVARIANTS option is used in a number of source files to enable
@@ -310,7 +304,7 @@ options KTRACE #kernel tracing
# for these conditions, which can only occur as a result of
# programming errors.
#
-options INVARIANTS
+options INVARIANTS
#
# The INVARIANT_SUPPORT option makes us compile in support for
@@ -320,20 +314,20 @@ options INVARIANTS
# source files (by changing the source file or specifying it on the
# command line) if you have 'INVARIANT_SUPPORT' enabled.
#
-options INVARIANT_SUPPORT
+options INVARIANT_SUPPORT
#
# The DIAGNOSTIC option is used to enable extra debugging information
# from some parts of the kernel. As this makes everything more noisy,
# it is disabled by default.
#
-options DIAGNOSTIC
+options DIAGNOSTIC
#
# PERFMON causes the driver for Pentium/Pentium Pro performance counters
# to be compiled. See perfmon(4) for more information.
#
-options PERFMON
+options PERFMON
#
@@ -342,17 +336,17 @@ options PERFMON
# quality assurance purposes (like this file, which the option takes it name
# from.)
#
-options COMPILING_LINT
+options COMPILING_LINT
# XXX - this doesn't belong here.
# Allow ordinary users to take the console - this is useful for X.
-options UCONSOLE
+options UCONSOLE
# XXX - this doesn't belong here either
-options USERCONFIG #boot -c editor
-options INTRO_USERCONFIG #imply -c and show intro screen
-options VISUAL_USERCONFIG #visual boot -c editor
+options USERCONFIG #boot -c editor
+options INTRO_USERCONFIG #imply -c and show intro screen
+options VISUAL_USERCONFIG #visual boot -c editor
#####################################################################
# NETWORKING OPTIONS
@@ -363,16 +357,16 @@ options VISUAL_USERCONFIG #visual boot -c editor
# Source code for the NS (Xerox Network Service) is provided for amusement
# value.
#
-options INET #Internet communications protocols
+options INET #Internet communications protocols
-options IPX #IPX/SPX communications protocols
-options IPXIP #IPX in IP encapsulation (not available)
-options IPTUNNEL #IP in IPX encapsulation (not available)
+options IPX #IPX/SPX communications protocols
+options IPXIP #IPX in IP encapsulation (not available)
+options IPTUNNEL #IP in IPX encapsulation (not available)
-options NETATALK #Appletalk communications protocols
+options NETATALK #Appletalk communications protocols
# These are currently broken but are shipped due to interest.
-#options NS #Xerox NS protocols
+#options NS #Xerox NS protocols
# These are currently broken and are no longer shipped due to lack
# of interest.
@@ -447,9 +441,9 @@ pseudo-device disc #Discard device
pseudo-device tun 1 #Tunnel driver
pseudo-device sl 2 #Serial Line IP
pseudo-device ppp 2 #Point-to-point protocol
-options PPP_BSDCOMP #PPP BSD-compress support
-options PPP_DEFLATE #PPP zlib/deflate/gzip support
-options PPP_FILTER #enable bpf filtering (needs bpfilter)
+options PPP_BSDCOMP #PPP BSD-compress support
+options PPP_DEFLATE #PPP zlib/deflate/gzip support
+options PPP_FILTER #enable bpf filtering (needs bpfilter)
#
# Internet family options:
@@ -493,20 +487,20 @@ options PPP_FILTER #enable bpf filtering (needs bpfilter)
#
# TCPDEBUG is undocumented.
#
-options "TCP_COMPAT_42" #emulate 4.2BSD TCP bugs
-options MROUTING # Multicast routing
+options "TCP_COMPAT_42" #emulate 4.2BSD TCP bugs
+options MROUTING # Multicast routing
options IPFIREWALL #firewall
options IPFIREWALL_VERBOSE #print information about
# dropped packets
options IPFIREWALL_FORWARD #enable transparent proxy support
-options "IPFIREWALL_VERBOSE_LIMIT=100" #limit verbosity
-options IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
-options IPDIVERT #divert sockets
-options IPFILTER #kernel ipfilter support
-options IPFILTER_LOG #ipfilter logging
-#options IPFILTER_LKM #kernel support for ip_fil.o LKM
-options IPSTEALTH #support for stealth forwarding
-options TCPDEBUG
+options "IPFIREWALL_VERBOSE_LIMIT=100" #limit verbosity
+options IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
+options IPDIVERT #divert sockets
+options IPFILTER #kernel ipfilter support
+options IPFILTER_LOG #ipfilter logging
+#options IPFILTER_LKM #kernel support for ip_fil.o LKM
+options IPSTEALTH #support for stealth forwarding
+options TCPDEBUG
# The following options add sysctl variables for controlling how certain
# TCP packets are handled.
@@ -532,8 +526,8 @@ options "ICMP_BANDLIM"
# IPFIREWALL as well. See the dummynet(4) manpage for more info.
# BRIDGE enables bridging between ethernet cards -- see bridge(4).
# You can use IPFIREWALL and dummynet together with bridging.
-options DUMMYNET
-options BRIDGE
+options DUMMYNET
+options BRIDGE
#
# ATM (HARP version) options
@@ -557,11 +551,11 @@ options BRIDGE
# The `hfa' driver provides support for the FORE Systems, Inc.
# PCA-200E ATM PCI Adapter.
#
-options ATM_CORE #core ATM protocol family
-options ATM_IP #IP over ATM support
-options ATM_SIGPVC #SIGPVC signalling manager
-options ATM_SPANS #SPANS signalling manager
-options ATM_UNI #UNI signalling manager
+options ATM_CORE #core ATM protocol family
+options ATM_IP #IP over ATM support
+options ATM_SIGPVC #SIGPVC signalling manager
+options ATM_SPANS #SPANS signalling manager
+options ATM_UNI #UNI signalling manager
device hea0 #Efficient ENI-155p ATM PCI
device hfa0 #FORE PCA-200E ATM PCI
@@ -583,30 +577,30 @@ device hfa0 #FORE PCA-200E ATM PCI
#
# One of these is mandatory:
-options FFS #Fast filesystem
-options MFS #Memory File System
-options NFS #Network File System
+options FFS #Fast filesystem
+options MFS #Memory File System
+options NFS #Network File System
# The rest are optional:
-# options NFS_NOSERVER #Disable the NFS-server code.
-options "CD9660" #ISO 9660 filesystem
-options FDESC #File descriptor filesystem
-options KERNFS #Kernel filesystem
-options MSDOSFS #MS DOS File System
-options NTFS #NT File System
-options NULLFS #NULL filesystem
-options PORTAL #Portal filesystem
-options PROCFS #Process filesystem
-options UMAPFS #UID map filesystem
-options UNION #Union filesystem
+# options NFS_NOSERVER #Disable the NFS-server code.
+options "CD9660" #ISO 9660 filesystem
+options FDESC #File descriptor filesystem
+options KERNFS #Kernel filesystem
+options MSDOSFS #MS DOS File System
+options NTFS #NT File System
+options NULLFS #NULL filesystem
+options PORTAL #Portal filesystem
+options PROCFS #Process filesystem
+options UMAPFS #UID map filesystem
+options UNION #Union filesystem
# The xFS_ROOT options REQUIRE the associated ``options xFS''
-options "CD9660_ROOT" #CD-ROM usable as root device
-options FFS_ROOT #FFS usable as root device
-options MFS_ROOT #MFS usable as root device
-options NFS_ROOT #NFS usable as root device
+options "CD9660_ROOT" #CD-ROM usable as root device
+options FFS_ROOT #FFS usable as root device
+options MFS_ROOT #MFS usable as root device
+options NFS_ROOT #NFS usable as root device
# This code is still experimental (e.g. doesn't handle disk slices well).
# Also, 'options MFS' is currently incompatible with DEVFS.
-options DEVFS #devices filesystem
+options DEVFS #devices filesystem
# Soft updates is technique for improving file system speed and
# making abrupt shutdown less risky. It is not enabled by default due
@@ -616,35 +610,35 @@ options DEVFS #devices filesystem
# do to enable this. ../../contrib/softupdates/README gives
# more details on how they actually work.
#
-#options SOFTUPDATES
+#options SOFTUPDATES
# Make space in the kernel for a MFS root filesystem. Define to the number
# of kilobytes to reserve for the filesystem.
-options MFS_ROOT_SIZE=10
+options MFS_ROOT_SIZE=10
# Allows MFS filesystems to be exported via nfs
-options EXPORTMFS
+options EXPORTMFS
# Allow this many swap-devices.
-options NSWAPDEV=20
+options NSWAPDEV=20
# Disk quotas are supported when this option is enabled. If you
# change the value of this option, you must do a `make clean' in your
# kernel compile directory in order to get a working kernel.
#
-options QUOTA #enable disk quotas
+options QUOTA #enable disk quotas
# Add more checking code to various filesystems
-#options NULLFS_DIAGNOSTIC
-#options KERNFS_DIAGNOSTIC
-#options UMAPFS_DIAGNOSTIC
-#options UNION_DIAGNOSTIC
+#options NULLFS_DIAGNOSTIC
+#options KERNFS_DIAGNOSTIC
+#options UMAPFS_DIAGNOSTIC
+#options UNION_DIAGNOSTIC
# In particular multi-session CD-Rs might require a huge amount of
# time in order to "settle". If we are about mounting them as the
# root f/s, we gotta wait a little.
#
# The number is supposed to be in seconds.
-options "CD9660_ROOTDELAY=20"
+options "CD9660_ROOTDELAY=20"
# If you are running a machine just as a fileserver for PC and MAC
# users, using SAMBA or Netatalk, you may consider setting this option
@@ -659,27 +653,27 @@ options "CD9660_ROOTDELAY=20"
# you all the support calls as the filesystem it's used on will act as
# they expect: "It's my dir so it must be my file".
#
-options SUIDDIR
+options SUIDDIR
# Add some error checking code to the null_bypass routine
# in the NULL filesystem
-#options SAFETY
+#options SAFETY
# NFS options:
-options "NFS_MINATTRTIMO=3" # VREG attrib cache timeout in sec
-options "NFS_MAXATTRTIMO=60"
-options "NFS_MINDIRATTRTIMO=30" # VDIR attrib cache timeout in sec
-options "NFS_MAXDIRATTRTIMO=60"
-options "NFS_GATHERDELAY=10" # Default write gather delay (msec)
-options "NFS_UIDHASHSIZ=29" # Tune the size of nfssvc_sock with this
-options "NFS_WDELAYHASHSIZ=16" # and with this
-options "NFS_MUIDHASHSIZ=63" # Tune the size of nfsmount with this
-options NFS_DEBUG # Enable NFS Debugging
+options "NFS_MINATTRTIMO=3" # VREG attrib cache timeout in sec
+options "NFS_MAXATTRTIMO=60"
+options "NFS_MINDIRATTRTIMO=30" # VDIR attrib cache timeout in sec
+options "NFS_MAXDIRATTRTIMO=60"
+options "NFS_GATHERDELAY=10" # Default write gather delay (msec)
+options "NFS_UIDHASHSIZ=29" # Tune the size of nfssvc_sock with this
+options "NFS_WDELAYHASHSIZ=16" # and with this
+options "NFS_MUIDHASHSIZ=63" # Tune the size of nfsmount with this
+options NFS_DEBUG # Enable NFS Debugging
# Coda stuff:
-options CODA #CODA filesystem.
+options CODA #CODA filesystem.
pseudo-device vcoda 4 #coda minicache <-> venus comm.
@@ -691,9 +685,9 @@ pseudo-device vcoda 4 #coda minicache <-> venus comm.
# _KPOSIX_PRIORITY_SCHEDULING: Build in _POSIX_PRIORITY_SCHEDULING
# _KPOSIX_VERSION: Version kernel is built for
-options "P1003_1B"
-options "_KPOSIX_PRIORITY_SCHEDULING"
-options "_KPOSIX_VERSION=199309L"
+options "P1003_1B"
+options "_KPOSIX_PRIORITY_SCHEDULING"
+options "_KPOSIX_VERSION=199309L"
#####################################################################
@@ -774,16 +768,16 @@ device sctarg0 at scbus? # SCSI target
# SCSI_DELAY: The number of MILLISECONDS to freeze the SIM (scsi adapter)
# queue after a bus reset, and the number of milliseconds to
# freeze the device queue after a bus device reset.
-options CAMDEBUG
-options "CAM_DEBUG_BUS=-1"
-options "CAM_DEBUG_TARGET=-1"
-options "CAM_DEBUG_LUN=-1"
-options "CAM_DEBUG_FLAGS=CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_CDB"
-options "CAM_MAX_HIGHPOWER=4"
-options SCSI_NO_SENSE_STRINGS
-options SCSI_NO_OP_STRINGS
-options SCSI_REPORT_GEOMETRY
-options SCSI_DELAY=8000 # Be pessimistic about Joe SCSI device
+options CAMDEBUG
+options "CAM_DEBUG_BUS=-1"
+options "CAM_DEBUG_TARGET=-1"
+options "CAM_DEBUG_LUN=-1"
+options "CAM_DEBUG_FLAGS=CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_CDB"
+options "CAM_MAX_HIGHPOWER=4"
+options SCSI_NO_SENSE_STRINGS
+options SCSI_NO_OP_STRINGS
+options SCSI_REPORT_GEOMETRY
+options SCSI_DELAY=8000 # Be pessimistic about Joe SCSI device
# Options for the CAM CDROM driver:
# CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN
@@ -796,22 +790,22 @@ options SCSI_DELAY=8000 # Be pessimistic about Joe SCSI device
# kern.cam.cd.changer.min_busy_seconds
# kern.cam.cd.changer.max_busy_seconds
#
-options "CHANGER_MIN_BUSY_SECONDS=2"
-options "CHANGER_MAX_BUSY_SECONDS=10"
+options "CHANGER_MIN_BUSY_SECONDS=2"
+options "CHANGER_MAX_BUSY_SECONDS=10"
# Options for the CAM sequential access driver:
# SA_SPACE_TIMEOUT: Timeout for space operations, in minutes
# SA_REWIND_TIMEOUT: Timeout for rewind operations, in minutes
# SA_ERASE_TIMEOUT: Timeout for erase operations, in minutes
# SA_1FM_AT_EOD: Default to model which only has a default one filemark at EOT.
-options "SA_SPACE_TIMEOUT=(60)"
-options "SA_REWIND_TIMEOUT=(2*60)"
-options "SA_ERASE_TIMEOUT=(4*60)"
-options "SA_1FM_AT_EOD"
+options "SA_SPACE_TIMEOUT=(60)"
+options "SA_REWIND_TIMEOUT=(2*60)"
+options "SA_ERASE_TIMEOUT=(4*60)"
+options "SA_1FM_AT_EOD"
# Optional timeout for the CAM processor target (pt) device
# This is specified in seconds. The default is 60 seconds.
-options SCSI_PT_DEFAULT_TIMEOUT="60"
+options SCSI_PT_DEFAULT_TIMEOUT="60"
#####################################################################
@@ -835,7 +829,7 @@ options VINUMDEBUG #enable Vinum debugging hooks
#pseudo-device tb
# Size of the kernel message buffer. Should be N * pagesize.
-options "MSGBUF_SIZE=40960"
+options "MSGBUF_SIZE=40960"
#####################################################################
@@ -881,18 +875,18 @@ controller isa0
#
# PAS_JOYSTICK_ENABLE enables the gameport on the ProAudio Spectrum
-options "AUTO_EOI_1"
-#options "AUTO_EOI_2"
-options "MAXMEM=(128*1024)"
+options "AUTO_EOI_1"
+#options "AUTO_EOI_2"
+options "MAXMEM=(128*1024)"
options "TUNE_1542"
-#options BROKEN_KEYBOARD_RESET
-#options PAS_JOYSTICK_ENABLE
+#options BROKEN_KEYBOARD_RESET
+#options PAS_JOYSTICK_ENABLE
# Enable support for the kernel PLL to use an external PPS signal,
# under supervision of [x]ntpd(8)
# More info in ftp://ftp.udel.edu/pub/ntp/kernel.tar.Z
-options PPS_SYNC
+options PPS_SYNC
# If you see the "calcru: negative time of %ld usec for pid %d (%s)\n"
# message you probably have some broken sw/hw which disables interrupts
@@ -900,7 +894,7 @@ options PPS_SYNC
# choosing a high value for NTIMECOUNTER. The default is 5, there
# is no upper limit but more than a couple of hundred are not productive.
-options "NTIMECOUNTER=20"
+options "NTIMECOUNTER=20"
# Enable PnP support in the kernel. This allows you to automaticly
# attach to PnP cards for drivers that support it and allows you to
@@ -914,12 +908,12 @@ controller atkbdc0 at isa? port IO_KBD tty
device atkbd0 at isa? tty irq 1
# Options for atkbd:
-options ATKBD_DFLT_KEYMAP # specify the built-in keymap
+options ATKBD_DFLT_KEYMAP # specify the built-in keymap
makeoptions ATKBD_DFLT_KEYMAP="jp.106"
# These options are valid for other keyboard drivers as well.
-options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap
-options KBD_INSTALL_CDEV # install a CDEV entry in /dev
+options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap
+options KBD_INSTALL_CDEV # install a CDEV entry in /dev
# `flags' for atkbd:
# 0x01 Force detection of keyboard, else we always assume a keyboard
@@ -930,9 +924,9 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev
device psm0 at isa? tty irq 12
# Options for psm:
-options PSM_HOOKAPM #hook the APM resume event, useful
+options PSM_HOOKAPM #hook the APM resume event, useful
#for some laptops
-options PSM_RESETAFTERSUSPEND #reset the device at the resume event
+options PSM_RESETAFTERSUSPEND #reset the device at the resume event
# The video card driver.
device vga0 at isa? port ? conflicts
@@ -941,36 +935,36 @@ device vga0 at isa? port ? conflicts
# Try the following option if the mouse pointer is not drawn correctly
# or font does not seem to be loaded properly. May cause flicker on
# some systems.
-options VGA_ALT_SEQACCESS
+options VGA_ALT_SEQACCESS
# If you can dispense with some vga driver features, you may want to
# use the following options to save some memory.
-options VGA_NO_FONT_LOADING # don't save/load font
-options VGA_NO_MODE_CHANGE # don't change video modes
+options VGA_NO_FONT_LOADING # don't save/load font
+options VGA_NO_MODE_CHANGE # don't change video modes
# Older video cards may require this option for proper operation.
-options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs
+options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs
# To include support for VESA video modes
-options VESA # needs VM86 defined too!!
+options VESA # needs VM86 defined too!!
# Splash screen at start up! Screen savers require this too.
pseudo-device splash
# The pcvt console driver (vt220 compatible).
device vt0 at isa? tty
-options XSERVER # support for running an X server.
-options FAT_CURSOR # start with block cursor
+options XSERVER # support for running an X server.
+options FAT_CURSOR # start with block cursor
# This PCVT option is for keyboards such as those used on IBM ThinkPad laptops
-options PCVT_SCANSET=2 # IBM keyboards are non-std
+options PCVT_SCANSET=2 # IBM keyboards are non-std
# The syscons console driver (sco color console compatible).
device sc0 at isa? tty
-options MAXCONS=16 # number of virtual consoles
-options "STD8X16FONT" # Compile font in
+options MAXCONS=16 # number of virtual consoles
+options "STD8X16FONT" # Compile font in
makeoptions "STD8X16FONT"="cp850"
-options SC_HISTORY_SIZE=200 # number of history buffer lines
-options SC_DISABLE_REBOOT # disable reboot key sequence
+options SC_HISTORY_SIZE=200 # number of history buffer lines
+options SC_DISABLE_REBOOT # disable reboot key sequence
#
# `flags' for sc0:
@@ -1105,7 +1099,7 @@ options "CMD640" #Enable work around for CMD640 h/w bug
# ATAPI enables the support for ATAPI-compatible IDE devices
#
options ATAPI #Enable ATAPI support for IDE bus
-options ATAPI_STATIC #Don't do it as an LKM
+options ATAPI_STATIC #Don't do it as an LKM
#
# This option allow you to override the default probe time for IDE
@@ -1113,7 +1107,7 @@ options ATAPI_STATIC #Don't do it as an LKM
# the IDE specs, but may still work for you (it will work for most
# people).
#
-options IDE_DELAY=8000 # Be optimistic about Joe IDE device
+options IDE_DELAY=8000 # Be optimistic about Joe IDE device
# IDE CD-ROM & CD-R/RW driver - requires wdc controller and ATAPI option
device acd0
@@ -1142,7 +1136,7 @@ disk id3 at ida0 drive 3
#
# To disable this behaviour, the following line should be used.
# Do this is you wish to boot of a different device.
-#options IDA_CUCKOO_MODE=0
+#options IDA_CUCKOO_MODE=0
#
# Standard floppy disk controllers and floppy tapes: `fdc', `fd', and `ft'
@@ -1152,15 +1146,15 @@ controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2
# FDC_DEBUG enables floppy debugging. Since the debug output is huge, you
# gotta turn it actually on by setting the variable fd_debug with DDB,
# however.
-options FDC_DEBUG
+options FDC_DEBUG
# FDC_YE enables support for the floppies used on the Libretto. This is a
# pcmcia floppy. You will also need to add
#card "Y-E DATA" "External FDD"
# config 0x4 "fdc0" 10
# to your pccard.conf file.
-options FDC_YE
+options FDC_YE
# This option is undocumented on purpose.
-options FDC_PRINT_BOGUS_CHIPTYPE
+options FDC_PRINT_BOGUS_CHIPTYPE
#
# Activate this line instead of the fdc0 line above if you happen to
# have an Insight floppy tape. Probing them proved to be dangerous
@@ -1208,14 +1202,14 @@ device sio0 at isa? port "IO_COM1" tty flags 0x10 irq 4
#
# Options for serial drivers that support consoles (only for sio now):
-options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to
+options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to
#DDB, if available.
-options CONSPEED=9600 #default speed for serial console (default 9600)
+options CONSPEED=9600 #default speed for serial console (default 9600)
# Options for sio:
-options COM_ESP #code for Hayes ESP
-options COM_MULTIPORT #code for some cards with shared IRQs
-options "EXTRA_SIO=2" #number of extra sio ports to allocate
+options COM_ESP #code for Hayes ESP
+options COM_MULTIPORT #code for some cards with shared IRQs
+options "EXTRA_SIO=2" #number of extra sio ports to allocate
# Other flags for sio that aren't documented in the man page.
# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for
@@ -1265,8 +1259,8 @@ device lnc0 at isa? port 0x280 net irq 10 drq 0
device rdp0 at isa? port 0x378 net irq 7 flags 2
device sr0 at isa? port 0x300 net irq 5 iomem 0xd0000
device wi0 at isa? port? net irq ?
-options WLCACHE # enables the signal-strength cache
-options WLDEBUG # enables verbose debugging output
+options WLCACHE # enables the signal-strength cache
+options WLDEBUG # enables verbose debugging output
device wl0 at isa? port 0x300 net irq ?
device xe0 at isa? port? irq ?
# We can (bogusly) include both the dedicated PCCARD drivers and the generic
@@ -1294,7 +1288,7 @@ device oltr0 at isa?
pseudo-device atm
device en0
device en1
-options NATM #native ATM
+options NATM #native ATM
#
# Audio drivers: `snd', `sb', `pas', `gus', `pca'
@@ -1508,9 +1502,9 @@ device gp0 at isa? port 0x2c0 tty
device gsc0 at isa? port "IO_GSC1" tty drq 3
device joy0 at isa? port IO_GAME
device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000
-options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared
+options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared
device dgb0 at isa? port 0x220 iomem 0xfc000 iosiz ? tty
-options "NDGBPORTS=16" # Defaults to 16*NDGB
+options "NDGBPORTS=16" # Defaults to 16*NDGB
device dgm0 at isa? port 0x104 iomem 0xd0000 iosiz ? tty
device labpc0 at isa? port 0x260 tty irq 5
device rc0 at isa? port 0x220 tty irq 12
@@ -1556,7 +1550,7 @@ options AHC_ALLOW_MEMIO
# for most machines, but in particular the HP NetServer LC series comes
# with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11,
# thus you need to bump this figure to 12 for them.
-options "EISA_SLOTS=12"
+options "EISA_SLOTS=12"
#
# PCI devices & PCI options:
@@ -1575,8 +1569,9 @@ options "EISA_SLOTS=12"
# self-contained SCSI host adapters.
#
# The `isp' device provides support for the Qlogic ISP 1020, 1040
-# nd 1040B PCI SCSI host adapters, as well as the Qlogic ISP 2100
-# FC/AL Host Adapter.
+# nd 1040B PCI SCSI host adapters, ISP 1240 Dual Ultra SCSI,
+# ISP 1080 and 1280 (Dual) Ultra2, ISP 12160 Ultra3 SCSI, as well as
+# the Qlogic ISP 2100 and ISP 2200 Fibre Channel Host Adapters.
#
# The `al' device provides support for PCI fast ethernet adapters
# based on the ADMtek Inc. AL981 "Comet" chip..
@@ -1702,6 +1697,7 @@ controller pci0
controller ahc1
controller amd0
controller ncr0
+controller sym0
controller isp0
#
# Options for ISP
@@ -1734,25 +1730,34 @@ controller isp0
#
# ISP_DISABLE_1020_SUPPORT Disable support for 1020/1040 cards
# ISP_DISABLE_1080_SUPPORT Disable support for 1080/1240 cards
+# ISP_DISABLE_12160_SUPPORT Disable support for 12160 cards
# ISP_DISABLE_2100_SUPPORT Disable support for 2100 cards
-# (these really just to save code space)
-# (use of all three will cause the driver to not compile)
+# (these really just to save some code space)
+# (use of all four will cause the kernel to not compile)
#
# ISP_COMPILE_FW - compile all firmware in
# ISP_COMPILE_1020_FW - compile in 1020/1040 firmware
# ISP_COMPILE_1080_FW - compile in 1080/1240/1280 firmware
+# ISP_COMPILE_12160_FW - compile in 12160 firmware
# ISP_COMPILE_2100_FW - compile in 2100 firmware
# ISP_COMPILE_2200_FW - compile in 2200 firmware
#
+# ISP_TARGET_MODE - enable target mode operation
+# Note that this does not work in
+# the 3.X branch because some important
+# CAM midlayer changes are missing.
+#
+
options SCSI_ISP_NO_FWLOAD_MASK=0x12 # disable FW load for isp1, isp4
-options SCSI_ISP_WWN=\"0x5000000099990000\"
+options SCSI_ISP_WWN=\"0x5000000099990000\"
#options "ISP_DISABLE_1020_SUPPORT"
#options "ISP_DISABLE_1080_SUPPORT"
#options "ISP_DISABLE_2100_SUPPORT"
-#options "ISP_COMPILE_1020_FW=1"
-#options "ISP_COMPILE_1080_FW=1"
-#options "ISP_COMPILE_2100_FW=1"
-#options "ISP_COMPILE_2200_FW=1"
+#options "ISP_COMPILE_1020_FW=1"
+#options "ISP_COMPILE_1080_FW=1"
+#options "ISP_COMPILE_12160_FW=1"
+#options "ISP_COMPILE_2100_FW=1"
+#options "ISP_COMPILE_2200_FW=1"
# we want in full duplex mode.
device al0
@@ -1790,7 +1795,7 @@ device bktr0
#
# PCI options
#
-#options PCI_QUIET #quiets PCI code on chipset settings
+#options PCI_QUIET #quiets PCI code on chipset settings
#
# PCCARD/PCMCIA
@@ -1802,7 +1807,7 @@ device pcic0 at card?
device pcic1 at card?
# You may need to reset all pccards after resuming
-options PCIC_RESUME_RESET # reset after resume
+options PCIC_RESUME_RESET # reset after resume
#
# Laptop/Notebook options:
@@ -1814,7 +1819,7 @@ options PCIC_RESUME_RESET # reset after resume
# For older notebooks that signal a powerfail condition (external
# power supply dropped, or battery state low) by issuing an NMI:
-options POWERFAIL_NMI # make it beep instead of panicing
+options POWERFAIL_NMI # make it beep instead of panicing
#
# SMB bus
@@ -1987,7 +1992,7 @@ pseudo-device "i4btel" 2
# network driver for IP over raw HDLC ISDN
pseudo-device "i4bipr" 4
# enable VJ header compression detection for ipr i/f
-options IPR_VJ
+options IPR_VJ
#
# network driver for sync PPP over ISDN
pseudo-device "i4bisppp" 4
@@ -2024,21 +2029,21 @@ device ppc0 at isa? disable port? tty irq 7
# Kernel BOOTP support
-options BOOTP # Use BOOTP to obtain IP address/hostname
-options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info
-options "BOOTP_NFSV3" # Use NFS v3 to NFS mount root
-options BOOTP_COMPAT # Workaround for broken bootp daemons.
-options "BOOTP_WIRED_TO=fxp0" # Use interface fxp0 for BOOTP
+options BOOTP # Use BOOTP to obtain IP address/hostname
+options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info
+options "BOOTP_NFSV3" # Use NFS v3 to NFS mount root
+options BOOTP_COMPAT # Workaround for broken bootp daemons.
+options "BOOTP_WIRED_TO=fxp0" # Use interface fxp0 for BOOTP
# If you want to disable loadable kernel modules (LKM), you
# might want to use this option.
-#options NO_LKM
+#options NO_LKM
#
# Add tie-ins for a hardware watchdog. This only enable the hooks;
# the user must still supply the actual driver.
#
-options HW_WDOG
+options HW_WDOG
#
# Set the number of PV entries per process. Increasing this can
@@ -2061,14 +2066,14 @@ options "PMAP_SHPGPERPROC=201"
# (see also sysctls "vm.defer_swapspace_pageouts" and
# "vm.disable_swapspace_pageouts")
#
-#options NO_SWAPPING
+#options NO_SWAPPING
# Set the number of sf_bufs to allocate. sf_bufs are virtual buffers
# for sendfile(2) that are used to map file VM pages, and normally
# default to a quantity that is roughly 16*MAXUSERS+512. You would
# typically want about 4 of these for each simultaneous file send.
#
-options "NSFBUFS=1024"
+options "NSFBUFS=1024"
#
# Enable extra debugging code for locks. This include storing the
@@ -2076,75 +2081,75 @@ options "NSFBUFS=1024"
# and changing a number of function calls to pass around the relevant
# data. This is not at all useful unless you are debugging lock code.
#
-options DEBUG_LOCKS
+options DEBUG_LOCKS
# More undocumented options for linting.
-options CLK_CALIBRATION_LOOP
-options "CLK_USE_I8254_CALIBRATION"
-options CLK_USE_TSC_CALIBRATION
-options CLUSTERDEBUG
-options COMPAT_LINUX
-options CPU_UPGRADE_HW_CACHE
-options DEBUG
-options DEBUG_VFS_LOCKS
-options "DEBUG_1284"
-#options DISABLE_PSE
-options "EXT2FS"
-options "I586_PMC_GUPROF=0x70000"
-options "IBCS2"
-options KEY
-options KEY_DEBUG
-options LOCKF_DEBUG
-options LOUTB
-options KBD_MAXRETRY=4
-options KBD_MAXWAIT=6
-options KBD_RESETDELAY=201
-options KBDIO_DEBUG=2
-options MSGMNB=2049
-options MSGMNI=41
-options MSGSEG=2049
-options MSGSSZ=16
-options MSGTQL=41
-options NBUF=512
-options NETATALKDEBUG
-options NMBCLUSTERS=1024
-options NPX_DEBUG
-options PANIC_REBOOT_WAIT_TIME=16
-options "PCVT_24LINESDEF"
-options PCVT_CTRL_ALT_DEL
-options PCVT_EMU_MOUSE
-options PCVT_FREEBSD=211
-options PCVT_META_ESC
-options PCVT_NSCREENS=9
-options PCVT_PRETTYSCRNS
-options PCVT_SCREENSAVER
-options PCVT_USEKBDSEC
-options "PCVT_VT220KEYB"
-options PSM_DEBUG=1
-options SCSI_NCR_DEBUG
-options SCSI_NCR_DFLT_TAGS=4
-options SCSI_NCR_MAX_SYNC=10000
-options SCSI_NCR_MAX_WIDE=1
-options SCSI_NCR_MYADDR=7
-options SEMMAP=31
-options SEMMNI=11
-options SEMMNS=61
-options SEMMNU=31
-options SEMMSL=61
-options SEMOPM=101
-options SEMUME=11
-options SHOW_BUSYBUFS # List buffers that prevent root unmount
-options SHMALL=1025
-options "SHMMAX=(SHMMAXPGS*PAGE_SIZE+1)"
-options SHMMAXPGS=1025
-options SHMMIN=2
-options SHMMNI=33
-options SHMSEG=9
-options SI_DEBUG
-options SIMPLELOCK_DEBUG
-options SPX_HACK
-options VFS_BIO_DEBUG
+options CLK_CALIBRATION_LOOP
+options "CLK_USE_I8254_CALIBRATION"
+options CLK_USE_TSC_CALIBRATION
+options CLUSTERDEBUG
+options COMPAT_LINUX
+options CPU_UPGRADE_HW_CACHE
+options DEBUG
+options DEBUG_VFS_LOCKS
+options "DEBUG_1284"
+#options DISABLE_PSE
+options "EXT2FS"
+options "I586_PMC_GUPROF=0x70000"
+options "IBCS2"
+options KEY
+options KEY_DEBUG
+options LOCKF_DEBUG
+options LOUTB
+options KBD_MAXRETRY=4
+options KBD_MAXWAIT=6
+options KBD_RESETDELAY=201
+options KBDIO_DEBUG=2
+options MSGMNB=2049
+options MSGMNI=41
+options MSGSEG=2049
+options MSGSSZ=16
+options MSGTQL=41
+options NBUF=512
+options NETATALKDEBUG
+options NMBCLUSTERS=1024
+options NPX_DEBUG
+options PANIC_REBOOT_WAIT_TIME=16
+options "PCVT_24LINESDEF"
+options PCVT_CTRL_ALT_DEL
+options PCVT_EMU_MOUSE
+options PCVT_FREEBSD=211
+options PCVT_META_ESC
+options PCVT_NSCREENS=9
+options PCVT_PRETTYSCRNS
+options PCVT_SCREENSAVER
+options PCVT_USEKBDSEC
+options "PCVT_VT220KEYB"
+options PSM_DEBUG=1
+options SCSI_NCR_DEBUG
+options SCSI_NCR_DFLT_TAGS=4
+options SCSI_NCR_MAX_SYNC=10000
+options SCSI_NCR_MAX_WIDE=1
+options SCSI_NCR_MYADDR=7
+options SEMMAP=31
+options SEMMNI=11
+options SEMMNS=61
+options SEMMNU=31
+options SEMMSL=61
+options SEMOPM=101
+options SEMUME=11
+options SHOW_BUSYBUFS # List buffers that prevent root unmount
+options SHMALL=1025
+options "SHMMAX=(SHMMAXPGS*PAGE_SIZE+1)"
+options SHMMAXPGS=1025
+options SHMMIN=2
+options SHMMNI=33
+options SHMSEG=9
+options SI_DEBUG
+options SIMPLELOCK_DEBUG
+options SPX_HACK
+options VFS_BIO_DEBUG
# ALTQ options
options ALTQ #alternate queueing
@@ -2211,19 +2216,19 @@ options BLUE #blue by wu-chang feng
controller dpt0
# DPT options
-options DPT_VERIFY_HINTR
-options DPT_RESTRICTED_FREELIST
-#!CAM# options DPT_MEASURE_PERFORMANCE
-options DPT_FREELIST_IS_STACK
-#!CAM# options DPT_HANDLE_TIMEOUTS
-options DPT_TIMEOUT_FACTOR=4
-options DPT_INTR_DELAY=200 # Some motherboards need that
-options DPT_LOST_IRQ
-options DPT_RESET_HBA
+options DPT_VERIFY_HINTR
+options DPT_RESTRICTED_FREELIST
+#!CAM# options DPT_MEASURE_PERFORMANCE
+options DPT_FREELIST_IS_STACK
+#!CAM# options DPT_HANDLE_TIMEOUTS
+options DPT_TIMEOUT_FACTOR=4
+options DPT_INTR_DELAY=200 # Some motherboards need that
+options DPT_LOST_IRQ
+options DPT_RESET_HBA
# Don't EVER set this without having talked to Simon Shapiro on the phone
# first.
-options DPT_SHUTDOWN_SLEEP=500
+options DPT_SHUTDOWN_SLEEP=500
#
# Embedded system options:
@@ -2253,13 +2258,13 @@ device ums0
# debugging options for the USB subsystem
#
-options UHCI_DEBUG
-options OHCI_DEBUG
-options USB_DEBUG
+options UHCI_DEBUG
+options OHCI_DEBUG
+options USB_DEBUG
-options UGEN_DEBUG
-options UHID_DEBUG
-options UHUB_DEBUG
-options UKBD_DEBUG
-options ULPT_DEBUG
-options UMS_DEBUG
+options UGEN_DEBUG
+options UHID_DEBUG
+options UHUB_DEBUG
+options UKBD_DEBUG
+options ULPT_DEBUG
+options UMS_DEBUG
View
5 freebsd3/sys/i386/isa/if_ar.c
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/isa/if_ar.c,v 1.24.2.3 1999/12/01 19:41:36 julian Exp $
+ * $FreeBSD: src/sys/i386/isa/if_ar.c,v 1.24.2.4 2000/01/21 02:02:01 archie Exp $
*/
/*
@@ -1898,11 +1898,10 @@ ngar_constructor(node_p *nodep)
/*
* give our ok for a hook to be added...
* If we are not running this should kick the device into life.
- * We allow hooks called "control" and dlci[1-1023]
* The hook's private info points to our stash of info about that
* channel.
*/
-static int
+static int
ngar_newhook(node_p node, hook_p hook, const char *name)
{
struct ar_softc * sc = node->private;
View
5 freebsd3/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/isa/if_ed.c,v 1.148.2.4 1999/09/25 13:08:18 nyan Exp $
+ * $FreeBSD: src/sys/i386/isa/if_ed.c,v 1.148.2.5 2000/01/18 14:19:39 luigi Exp $
*/
/*
@@ -2783,6 +2783,9 @@ ed_get_packet(sc, buf, len, multicast)
ed_ring_copy(sc, buf+14, (char *)(eh+1), len - 14);
if (ifp != BDG_LOCAL )
bdg_forward(&m, ifp); /* not local, need forwarding */
+ if (m == NULL)
+ return ; /* dropped */
+ eh = mtod(m, struct ether_header *);
if (ifp == BDG_LOCAL || ifp == BDG_BCAST || ifp == BDG_MCAST)
goto getit ;
/* not local and not multicast, just drop it */
View
131 freebsd3/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
*/
/*
- * $FreeBSD: src/sys/i386/isa/if_fe.c,v 1.48.2.4 1999/09/01 23:56:52 nyan Exp $
+ * $FreeBSD: src/sys/i386/isa/if_fe.c,v 1.48.2.5 2000/04/01 13:11:11 nyan Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 3.x
@@ -268,6 +268,7 @@ static int fe_probe_ubn ( struct isa_device *, struct fe_softc * );
#ifdef PC98
static int fe_probe_re1000 ( struct isa_device *, struct fe_softc * );
static int fe_probe_cnet9ne( struct isa_device *, struct fe_softc * );
+static int fe_probe_rex ( struct isa_device *, struct fe_softc * );
#endif
#if NCARD > 0
static int fe_probe_mbh ( struct isa_device *, struct fe_softc * );
@@ -510,6 +511,7 @@ fe_probe (struct isa_device * dev)
#ifdef PC98
if (!nports) nports = fe_probe_re1000(dev, sc);
if (!nports) nports = fe_probe_cnet9ne(dev, sc);
+ if (!nports) nports = fe_probe_rex(dev, sc);
#endif
if (!nports) nports = fe_probe_ssi(dev, sc);
if (!nports) nports = fe_probe_jli(dev, sc);
@@ -1675,6 +1677,133 @@ fe_probe_ubn (struct isa_device * dev, struct fe_softc * sc)
return 0;
}
+/*
+ * REX boards(non-JLI type) support routine.
+ */
+
+#define REX_EEPROM_SIZE 32
+#define REX_DAT 0x01
+
+static void
+fe_read_eeprom_rex (struct fe_softc *sc, u_char *data)
+{
+ int i;
+ u_char bit, val;
+ u_char save16;
+ u_short reg16 = sc->ioaddr[0x10];
+
+ save16 = inb(reg16);
+
+ /* Issue a start condition. */
+ val = inb(reg16) & 0xf0;
+ outb(reg16, val);
+
+ (void)inb(reg16);
+ (void)inb(reg16);
+ (void)inb(reg16);
+ (void)inb(reg16);
+
+ /* Read bytes from EEPROM. */
+ for (i = 0; i < REX_EEPROM_SIZE; i++) {
+ /* Read a byte and store it into the buffer. */
+ val = 0x00;
+ for (bit = 0x01; bit != 0x00; bit <<= 1) {
+ if (inb(reg16) & REX_DAT) val |= bit;
+ }
+ *data++ = val;
+ }
+
+ outb(reg16, save16);
+
+#if 1
+ /* Report what we got. */
+ if (bootverbose) {
+ data -= REX_EEPROM_SIZE;
+ for (i = 0; i < REX_EEPROM_SIZE; i += 16) {
+ printf("fe%d: EEPROM(REX):%3x: %16D\n",
+ sc->sc_unit, i, data + i, " ");
+ }
+ }
+#endif
+}
+
+static void
+fe_init_rex ( struct fe_softc * sc )
+{
+ /* Setup IRQ control register on the ASIC. */
+ outb(sc->ioaddr[0x10], sc->priv_info);
+}
+
+/*
+ * Probe for RATOC REX-9880/81/82/83 series.
+ */
+static int
+fe_probe_rex (struct isa_device * dev, struct fe_softc * sc)
+{
+ int i;
+ u_char eeprom [REX_EEPROM_SIZE];
+
+ static struct fe_simple_probe_struct probe_table [] = {
+ { FE_DLCR2, 0x58, 0x00 },
+ { FE_DLCR4, 0x08, 0x00 },
+ { 0 }
+ };
+
+ /* See if the specified I/O address is possible for REX-9880. */
+ /* 6[46CE]D0 are allowed. */
+ if ((sc->iobase & ~0xA00) != 0x64D0) return 0;
+
+ /* Setup an I/O address mapping table and some others. */
+ fe_softc_defaults(sc);
+
+ /* Re-map ioaddr for REX-9880. */
+ for (i = 16; i < MAXREGISTERS; i++)
+ sc->ioaddr[i] = sc->iobase + 0x100 - 16 + i;
+
+ /* See if the card is on its address. */
+ if (!fe_simple_probe(sc, probe_table)) return 0;
+
+ /* We now have to read the config EEPROM. We should be very
+ careful, since doing so destroys a register. (Remember, we
+ are not yet sure we have a REX-9880 board here.) */
+ fe_read_eeprom_rex(sc, eeprom);
+ for (i = 0; i < ETHER_ADDR_LEN; i++)
+ sc->sc_enaddr[i] = eeprom[7 - i];
+
+ /* Make sure it is RATOC's. */
+ if (!valid_Ether_p(sc->sc_enaddr, 0x00C0D0)) return 0;
+
+ /* Setup the board type. */
+ sc->typestr = "REX-9880/9883";
+
+ /* This looks like a REX-9880 board. It requires an
+ explicit IRQ setting in config. Make sure we have one,
+ determining an appropriate value for the IRQ control
+ register. */
+ switch (dev->id_irq) {
+ case IRQ3: sc->priv_info = 0x10; break;
+ case IRQ5: sc->priv_info = 0x20; break;
+ case IRQ6: sc->priv_info = 0x40; break;
+ case IRQ12: sc->priv_info = 0x80; break;
+ default:
+ fe_irq_failure(sc->typestr,
+ sc->sc_unit, dev->id_irq, "3/5/6/12");
+ return 0;
+ }
+
+ /* Setup hooks. We need a special initialization procedure. */
+ sc->init = fe_init_rex;
+
+ /* REX-9880 has 64KB SRAM. */
+ sc->proto_dlcr6 = FE_D6_BUFSIZ_64KB | FE_D6_TXBSIZ_2x4KB
+ | FE_D6_BBW_WORD | FE_D6_SBW_WORD | FE_D6_SRAM;
+#if 1
+ sc->proto_dlcr7 |= FE_D7_EOPPOL; /* XXX */
+#endif
+ /* The I/O address range is fragmented in the REX-9880.
+ This is the number of regs at iobase. */
+ return 16;
+}
#else /* !PC98 */
/*
* Probe and initialization for Fujitsu FMV-180 series boards
View
15 freebsd3/sys/i386/isa/if_lnc.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/isa/if_lnc.c,v 1.51.2.4 1999/08/29 16:07:22 peter Exp $
+ * $FreeBSD: src/sys/i386/isa/if_lnc.c,v 1.51.2.6 2000/06/18 08:06:55 gj Exp $
*/
/*
@@ -151,6 +151,7 @@ static char const * const ic_ident[] = {
"PCnet-PCI II",
"PCnet-FAST",
"PCnet-FAST+",
+ "PCnet-Home",
};
static void lnc_setladrf __P((struct lnc_softc *sc));
@@ -1194,7 +1195,10 @@ pcnet_probe(struct lnc_softc *sc)
case Am79C971:
return (PCnet_FAST);
case Am79C972:
+ case Am79C973:
return (PCnet_FASTplus);
+ case Am79C978:
+ return (PCnet_Home);
default:
break;
}
@@ -1497,6 +1501,15 @@ lnc_init(struct lnc_softc *sc)
/* Give the LANCE the physical address of the initialisation block */
+ if (sc->nic.ic == PCnet_Home) {
+ u_short media;
+ /* Set PHY_SEL to HomeRun */
+ media = read_bcr(sc, BCR49);
+ media &= ~3;
+ media |= 1;
+ write_bcr(sc, BCR49, media);
+ }
+
write_csr(sc, CSR1, kvtop(sc->init_block));
write_csr(sc, CSR2, (kvtop(sc->init_block) >> 16) & 0xff);
View
7 freebsd3/sys/i386/isa/if_sr.c
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/isa/if_sr.c,v 1.21.2.4 1999/12/01 19:41:37 julian Exp $
+ * $FreeBSD: src/sys/i386/isa/if_sr.c,v 1.21.2.6 2000/01/21 02:02:03 archie Exp $
*/
/*
@@ -60,7 +60,7 @@
#include "bpfilter.h"
#endif /* NETGRAPH */
-#ifdef NETGRAPH
+#ifndef NETGRAPH
#include "sppp.h"
#if NSPPP <= 0
#error Device 'sr' requires sppp.
@@ -3358,11 +3358,10 @@ ngsr_constructor(node_p *nodep)
/*
* give our ok for a hook to be added...
* If we are not running this should kick the device into life.
- * We allow hooks called "control" and dlci[1-1023]
* The hook's private info points to our stash of info about that
* channel.
*/
-static int
+static int
ngsr_newhook(node_p node, hook_p hook, const char *name)
{
struct sr_softc * sc = node->private;
View
3  freebsd3/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $FreeBSD: src/sys/i386/isa/sio.c,v 1.224.2.8 1999/10/11 15:07:18 steve Exp $
+ * $FreeBSD: src/sys/i386/isa/sio.c,v 1.224.2.9 2000/04/02 05:31:53 peter Exp $
*/
#include "opt_comconsole.h"
@@ -2789,6 +2789,7 @@ static pnpid_t siopnp_ids[] = {
{ 0x01017256, "USR0101"},
{ 0x30207256, "USR2030"},
{ 0x31307256, "USR3031"},
+ { 0x50307256, "USR3050"},
{ 0x90307256, "USR3090"},
{ 0x0100440e, "Cardinal MVP288IV"},
{ 0 }
View
180 freebsd3/sys/kern/uipc_mbuf.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.37.2.3 1999/12/03 07:49:38 julian Exp $
+ * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.37.2.4 2000/06/10 17:44:56 jlemon Exp $
*/
#include <sys/param.h>
@@ -47,6 +47,10 @@
#include <vm/vm_kern.h>
#include <vm/vm_extern.h>
+#ifdef INVARIANTS
+#include <machine/cpu.h>
+#endif
+
static void mbinit __P((void *));
SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbinit, NULL)
@@ -59,6 +63,8 @@ int max_linkhdr;
int max_protohdr;
int max_hdr;
int max_datalen;
+u_int m_mballoc_wid = 0;
+u_int m_clalloc_wid = 0;
SYSCTL_INT(_kern_ipc, KIPC_MAX_LINKHDR, max_linkhdr, CTLFLAG_RW,
&max_linkhdr, 0, "");
@@ -67,6 +73,8 @@ SYSCTL_INT(_kern_ipc, KIPC_MAX_PROTOHDR, max_protohdr, CTLFLAG_RW,
SYSCTL_INT(_kern_ipc, KIPC_MAX_HDR, max_hdr, CTLFLAG_RW, &max_hdr, 0, "");
SYSCTL_INT(_kern_ipc, KIPC_MAX_DATALEN, max_datalen, CTLFLAG_RW,
&max_datalen, 0, "");
+SYSCTL_INT(_kern_ipc, OID_AUTO, mbuf_wait, CTLFLAG_RW,
+ &mbuf_wait, 0, "");
SYSCTL_STRUCT(_kern_ipc, KIPC_MBSTAT, mbstat, CTLFLAG_RW, &mbstat, mbstat, "");
static void m_reclaim __P((void));
@@ -121,10 +129,23 @@ m_mballoc(nmb, how)
register int i;
int nbytes;
- /* Once we run out of map space, it will be impossible to get
- * any more (nothing is ever freed back to the map) (XXX which
- * is dumb). (however you are not dead as m_reclaim might
- * still be able to free a substantial amount of space).
+ /*
+ * If we've hit the mbuf limit, stop allocating from mb_map,
+ * (or trying to) in order to avoid dipping into the section of
+ * mb_map which we've "reserved" for clusters.
+ */
+ if ((nmb + mbstat.m_mbufs) > nmbufs)
+ return (0);
+
+ /*
+ * Once we run out of map space, it will be impossible to get
+ * any more (nothing is ever freed back to the map)
+ * -- however you are not dead as m_reclaim might
+ * still be able to free a substantial amount of space.
+ *
+ * XXX Furthermore, we can also work with "recycled" mbufs (when
+ * we're calling with M_WAIT the sleep procedure will be woken
+ * up when an mbuf is freed. See m_mballoc_wait()).
*/
if (mb_map_full)
return (0);
@@ -153,6 +174,52 @@ m_mballoc(nmb, how)
return (1);
}
+/*
+ * Once the mb_map has been exhausted and if the call to the allocation macros
+ * (or, in some cases, functions) is with M_WAIT, then it is necessary to rely
+ * solely on reclaimed mbufs. Here we wait for an mbuf to be freed for a
+ * designated (mbuf_wait) time.
+ */
+struct mbuf *
+m_mballoc_wait(int caller, int type)
+{
+ struct mbuf *p;
+ int s;
+
+ m_mballoc_wid++;
+ if ((tsleep(&m_mballoc_wid, PVM, "mballc", mbuf_wait)) == EWOULDBLOCK)
+ m_mballoc_wid--;
+
+ /*
+ * Now that we (think) that we've got something, we will redo an
+ * MGET, but avoid getting into another instance of m_mballoc_wait()
+ * XXX: We retry to fetch _even_ if the sleep timed out. This is left
+ * this way, purposely, in the [unlikely] case that an mbuf was
+ * freed but the sleep was not awakened in time.
+ */
+ p = NULL;
+ switch (caller) {
+ case MGET_C:
+ MGET(p, M_DONTWAIT, type);
+ break;
+ case MGETHDR_C:
+ MGETHDR(p, M_DONTWAIT, type);
+ break;
+ default:
+ panic("m_mballoc_wait: invalid caller (%d)", caller);
+ }
+
+ s = splimp();
+ if (p != NULL) { /* We waited and got something... */
+ mbstat.m_wait++;
+ /* Wake up another if we have more free. */
+ if (mmbfree != NULL)
+ MMBWAKEUP();
+ }
+ splx(s);
+ return (p);
+}
+
#if MCLBYTES > PAGE_SIZE
static int i_want_my_mcl;
@@ -197,9 +264,20 @@ m_clalloc(ncl, how)
int npg;
/*
+ * If we've hit the mcluster number limit, stop allocating from
+ * mb_map, (or trying to) in order to avoid dipping into the section
+ * of mb_map which we've "reserved" for mbufs.
+ */
+ if ((ncl + mbstat.m_clusters) > nmbclusters) {
+ mbstat.m_drops++;
+ return (0);
+ }
+
+ /*
* Once we run out of map space, it will be impossible
* to get any more (nothing is ever freed back to the
- * map).
+ * map). From this point on, we solely rely on freed
+ * mclusters.
*/
if (mb_map_full) {
mbstat.m_drops++;
@@ -242,6 +320,47 @@ m_clalloc(ncl, how)
}
/*
+ * Once the mb_map submap has been exhausted and the allocation is called with
+ * M_WAIT, we rely on the mclfree union pointers. If nothing is free, we will
+ * sleep for a designated amount of time (mbuf_wait) or until we're woken up
+ * due to sudden mcluster availability.
+ */
+caddr_t
+m_clalloc_wait(void)
+{
+ caddr_t p;
+ int s;
+
+#ifdef __i386__
+ /* If in interrupt context, and INVARIANTS, maintain sanity and die. */
+ KASSERT(intr_nesting_level == 0, ("CLALLOC: CANNOT WAIT IN INTERRUPT"));
+#endif
+
+ /* Sleep until something's available or until we expire. */
+ m_clalloc_wid++;
+ if ((tsleep(&m_clalloc_wid, PVM, "mclalc", mbuf_wait)) == EWOULDBLOCK)
+ m_clalloc_wid--;
+
+ /*
+ * Now that we (think) that we've got something, we will redo and
+ * MGET, but avoid getting into another instance of m_clalloc_wait()
+ */
+ p = NULL;
+ MCLALLOC(p, M_DONTWAIT);
+
+ s = splimp();
+ if (p != NULL) { /* We waited and got something... */
+ mbstat.m_wait++;