Permalink
Browse files

sync with 3.5-RELEASE.

  • Loading branch information...
1 parent ff3ea22 commit 9d4e6e2776fe5a14c54720605f8e8fae846200ba sumikawa committed Jun 25, 2000
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
@@ -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);
-}
@@ -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
@@ -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=""
Oops, something went wrong.

0 comments on commit 9d4e6e2

Please sign in to comment.