Date: Tue, 5 Jul 2005 18:20:46 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 79622 for review Message-ID: <200507051820.j65IKkTh021155@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=79622 Change 79622 by peter@peter_overcee on 2005/07/05 18:20:38 IFC @79621 Affected files ... .. //depot/projects/hammer/lib/libc/posix1e/mac_prepare.3#5 integrate .. //depot/projects/hammer/lib/libkvm/kvm_alpha.c#2 integrate .. //depot/projects/hammer/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/hammer/release/doc/share/misc/man2hwnotes.pl#7 integrate .. //depot/projects/hammer/share/man/man1/builtin.1#5 integrate .. //depot/projects/hammer/share/zoneinfo/leapseconds#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#24 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#14 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#43 integrate .. //depot/projects/hammer/sys/conf/options.i386#39 integrate .. //depot/projects/hammer/sys/conf/options.pc98#35 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#13 integrate .. //depot/projects/hammer/sys/ddb/ddb.h#10 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#60 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#72 integrate .. //depot/projects/hammer/sys/i386/i386/dump_machdep.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/initcpu.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#62 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#68 integrate .. //depot/projects/hammer/sys/i386/i386/ptrace_machdep.c#3 integrate .. //depot/projects/hammer/sys/i386/include/_types.h#9 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#26 integrate .. //depot/projects/hammer/sys/i386/linux/linux_ptrace.c#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_interface.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/dump_machdep.c#8 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#50 integrate .. //depot/projects/hammer/sys/ia64/include/db_machdep.h#5 integrate .. //depot/projects/hammer/sys/ia64/include/md_var.h#13 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#87 integrate .. //depot/projects/hammer/sys/net/bridge.c#26 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#19 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#16 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#18 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#30 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#18 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_socketvar.h#4 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#60 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#24 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#53 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#45 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#12 integrate .. //depot/projects/hammer/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#46 integrate .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/hammer/sys/sys/iconv.h#7 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#21 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/index.c#8 integrate Differences ... ==== //depot/projects/hammer/lib/libc/posix1e/mac_prepare.3#5 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac_prepare.3,v 1.5 2004/07/03 22:30:08 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac_prepare.3,v 1.6 2005/07/03 12:35:11 delphij Exp $ .\" .Dd August 22, 2003 .Os @@ -61,7 +61,7 @@ .Xr mac_get 3 functions, the kernel will attempt to fill in the label elements specified when the label was prepared. -Elements are specified in a nul-terminate string, using commas to +Elements are specified in a nul-terminated string, using commas to delimit fields. Element names may be prefixed with the .Dv ? ==== //depot/projects/hammer/lib/libkvm/kvm_alpha.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_alpha.c,v 1.7 2001/10/13 04:38:46 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_alpha.c,v 1.8 2005/07/02 05:49:29 scottl Exp $"); #include <sys/param.h> #include <sys/user.h> @@ -109,7 +109,7 @@ _kvm_kvatop(kd, va, pa) kvm_t *kd; u_long va; - u_long *pa; + off_t *pa; { u_int64_t lev1map_pa; /* PA of Lev1map */ u_int64_t page_size; ==== //depot/projects/hammer/lib/libpmc/libpmc.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.7 2005/06/10 03:45:04 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.8 2005/07/03 16:33:21 jkoshy Exp $"); #include <sys/types.h> #include <sys/module.h> @@ -47,13 +47,13 @@ static int k7_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); #endif -#if defined(__amd64__) +#if defined(__amd64__) || defined(__i386__) static int k8_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); +static int p4_allocate_pmc(enum pmc_event _pe, char *_ctrspec, + struct pmc_op_pmcallocate *_pmc_config); #endif #if defined(__i386__) -static int p4_allocate_pmc(enum pmc_event _pe, char *_ctrspec, - struct pmc_op_pmcallocate *_pmc_config); static int p5_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); static int p6_allocate_pmc(enum pmc_event _pe, char *_ctrspec, @@ -154,7 +154,7 @@ #define PMCMASK(N,V) { .pm_name = #N, .pm_value = (V) } #define NULLMASK PMCMASK(NULL,0) -#if defined(__i386__) || defined(__amd64__) +#if defined(__amd64__) || defined(__i386__) static int pmc_parse_mask(const struct pmc_masks *pmask, char *p, uint32_t *evmask) { @@ -301,7 +301,7 @@ #endif -#if defined(__amd64__) +#if defined(__amd64__) || defined(__i386__) /* * AMD K8 PMCs. @@ -670,7 +670,7 @@ #endif -#if defined(__i386__) +#if defined(__amd64__) || defined(__i386__) /* * Intel P4 PMCs @@ -1283,6 +1283,10 @@ return 0; } +#endif + +#if defined(__i386__) + /* * Pentium style PMCs */ @@ -1950,11 +1954,12 @@ pmc_mdep_event_aliases = p6_aliases; pmc_mdep_allocate_pmc = p6_allocate_pmc; break; +#endif +#if defined(__amd64__) || defined(__i386__) case PMC_CPU_INTEL_PIV: pmc_mdep_event_aliases = p4_aliases; pmc_mdep_allocate_pmc = p4_allocate_pmc; break; -#elif defined(__amd64__) case PMC_CPU_AMD_K8: pmc_mdep_event_aliases = k8_aliases; pmc_mdep_allocate_pmc = k8_allocate_pmc; ==== //depot/projects/hammer/release/doc/share/misc/man2hwnotes.pl#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Emacs should use -*- cperl -*- mode # -# Copyright (c) 2003-2004 Simon L. Nielsen <simon@FreeBSD.org> +# Copyright (c) 2003-2005 Simon L. Nielsen <simon@FreeBSD.org> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.11 2004/12/14 13:07:58 simon Exp $ +# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.12 2005/07/04 07:48:02 simon Exp $ # # Parse the list of supported hardware out of section 4 manual pages @@ -223,6 +223,9 @@ add_listitem(\%mdocvars); } + # Remove quotes, if any. + $txt =~ s/"(.*)"/$1/; + if ($mdocvars{listtype} eq "column") { # Ignore first item when it is likely to be a # header. ==== //depot/projects/hammer/share/man/man1/builtin.1#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/share/man/man1/builtin.1,v 1.23 2005/06/15 13:21:44 ru Exp $ +.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.24 2005/07/02 19:51:11 dannyboy Exp $ .\" .Dd February 23, 2005 .Dt BUILTIN 1 @@ -191,7 +191,7 @@ .It Ic case Ta \&No Ta Yes Ta Yes .It Ic cd Ta \&No** Ta Yes Ta Yes .It Ic chdir Ta \&No Ta Yes Ta \&Yes -.It Ic command Ta \&No Ta \&No Ta Yes +.It Ic command Ta \&No** Ta \&No Ta Yes .It Ic complete Ta \&No Ta Yes Ta \&No .It Ic continue Ta \&No Ta Yes Ta \&Yes .It Ic default Ta \&No Ta Yes Ta \&No ==== //depot/projects/hammer/share/zoneinfo/leapseconds#5 (text+ko) ==== @@ -43,6 +43,7 @@ Leap 1995 Dec 31 23:59:60 + S Leap 1997 Jun 30 23:59:60 + S Leap 1998 Dec 31 23:59:60 + S +Leap 2005 Dec 31 23:59:60 + S # # @@ -56,36 +57,43 @@ # 61, Av. de l'Observatoire 75014 PARIS (France) # Tel. : 33 (0) 1 40 51 22 26 # FAX : 33 (0) 1 40 51 22 91 -# Internet : services.iers@obspm.fr +# e-mail : services.iers@obspm.fr +# http://hpiers.obspm.fr/eop-pc # -# Paris, 14 January 2005 +# Paris, 4 July 2005 # -# -# Bulletin C 29 +# Bulletin C 30 # -# To authorities responsible -# for the measurement and -# distribution of time -# +# To authorities responsible +# for the measurement and +# distribution of time # # -# INFORMATION ON UTC - TAI +# UTC TIME STEP +# on the 1st of January 2006 # # -# NO positive leap second will be introduced at the end of June 2005. -# The difference between Coordinated Universal Time UTC and the -# International Atomic Time TAI is : +# A positive leap second will be introduced at the end of December 2005. +# The sequence of dates of the UTC second markers will be: # -# from 1999 January 1, 0h UTC, until further notice : UTC-TAI = -32 s -# +# 2005 December 31, 23h 59m 59s +# 2005 December 31, 23h 59m 60s +# 2006 January 1, 0h 0m 0s +# +# The difference between UTC and the International Atomic Time TAI is: +# +# from 1999 January 1, 0h UTC, to 2006 January 1 0h UTC : UTC-TAI = - 32s +# from 2006 January 1, 0h UTC, until further notice : UTC-TAI = - 33s +# # Leap seconds can be introduced in UTC at the end of the months of December -# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every -# six months, either to announce a time step in UTC, or to confirm that there +# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every +# six months, either to announce a time step in UTC or to confirm that there # will be no time step at the next possible date. +# # # -# Daniel GAMBIS -# Director -# Earth Orientation Center of IERS -# Observatoire de Paris, France +# Daniel GAMBIS +# Head +# Earth Orientation Center of IERS +# Observatoire de Paris, France # ==== //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#24 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.10 2005/06/29 22:28:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.11 2005/07/02 19:57:30 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -156,6 +156,7 @@ error = di->dumper(di->priv, buffer, 0, dumplo, DEV_BSIZE); dumplo += DEV_BSIZE; + fragsz = 0; return (error); } ==== //depot/projects/hammer/sys/amd64/include/_types.h#14 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.8 2005/03/11 22:16:09 peter Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.9 2005/07/02 23:13:30 thompsa Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -43,6 +43,8 @@ #error this file needs sys/cdefs.h as a prerequisite #endif +#define __NO_STRICT_ALIGNMENT + /* * Basic types upon which most other types are built. */ ==== //depot/projects/hammer/sys/amd64/isa/clock.c#43 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.219 2005/05/14 09:10:00 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.220 2005/07/01 20:13:19 peter Exp $"); /* * Routines to handle clock hardware. ==== //depot/projects/hammer/sys/conf/options.i386#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.224 2005/06/29 23:23:16 peter Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.225 2005/07/02 20:06:42 delphij Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -51,7 +51,6 @@ CPU_ELAN_PPS opt_cpu.h CPU_ELAN_XTAL opt_cpu.h CPU_ENABLE_LONGRUN opt_cpu.h -CPU_ENABLE_SSE opt_cpu.h CPU_FASTER_5X86_FPU opt_cpu.h CPU_GEODE opt_cpu.h CPU_I486_ON_386 opt_cpu.h ==== //depot/projects/hammer/sys/conf/options.pc98#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.188 2005/06/29 23:23:16 peter Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.189 2005/07/02 20:06:42 delphij Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -41,7 +41,6 @@ CPU_DISABLE_5X86_LSSER opt_cpu.h CPU_DISABLE_CMPXCHG opt_global.h # XXX global, unlike other CPU_* CPU_DISABLE_SSE opt_cpu.h -CPU_ENABLE_SSE opt_cpu.h CPU_FASTER_5X86_FPU opt_cpu.h CPU_GEODE opt_cpu.h CPU_I486_ON_386 opt_cpu.h ==== //depot/projects/hammer/sys/ddb/db_command.c#13 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.59 2005/01/06 01:34:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.60 2005/07/02 23:52:37 marcel Exp $"); #include <sys/param.h> #include <sys/linker_set.h> @@ -472,6 +472,25 @@ * Call random function: * !expr(arg,arg,arg) */ + +/* The generic implementation supports a maximum of 10 arguments. */ +typedef db_expr_t __db_f(db_expr_t, db_expr_t, db_expr_t, db_expr_t, + db_expr_t, db_expr_t, db_expr_t, db_expr_t, db_expr_t, db_expr_t); + +static __inline int +db_fncall_generic(db_expr_t addr, db_expr_t *rv, int nargs, db_expr_t args[]) +{ + __db_f *f = (__db_f *)addr; + + if (nargs > 10) { + db_printf("Too many arguments (max 10)\n"); + return (0); + } + *rv = (*f)(args[0], args[1], args[2], args[3], args[4], args[5], + args[6], args[7], args[8], args[9]); + return (1); +} + static void db_fncall(dummy1, dummy2, dummy3, dummy4) db_expr_t dummy1; @@ -480,14 +499,9 @@ char * dummy4; { db_expr_t fn_addr; -#define MAXARGS 11 /* XXX only 10 are passed */ - db_expr_t args[MAXARGS]; + db_expr_t args[DB_MAXARGS]; int nargs = 0; db_expr_t retval; - typedef db_expr_t fcn_10args_t(db_expr_t, db_expr_t, db_expr_t, - db_expr_t, db_expr_t, db_expr_t, db_expr_t, - db_expr_t, db_expr_t, db_expr_t); - fcn_10args_t *func; int t; if (!db_expression(&fn_addr)) { @@ -495,15 +509,14 @@ db_flush_lex(); return; } - func = (fcn_10args_t *)fn_addr; /* XXX */ t = db_read_token(); if (t == tLPAREN) { if (db_expression(&args[0])) { nargs++; while ((t = db_read_token()) == tCOMMA) { - if (nargs == MAXARGS) { - db_printf("Too many arguments\n"); + if (nargs == DB_MAXARGS) { + db_printf("Too many arguments (max %d)\n", DB_MAXARGS); db_flush_lex(); return; } @@ -524,13 +537,8 @@ } db_skip_to_eol(); - while (nargs < MAXARGS) { - args[nargs++] = 0; - } - - retval = (*func)(args[0], args[1], args[2], args[3], args[4], - args[5], args[6], args[7], args[8], args[9] ); - db_printf("%#lr\n", (long)retval); + if (DB_CALL(fn_addr, &retval, nargs, args)) + db_printf("= %#lr\n", (long)retval); } static void ==== //depot/projects/hammer/sys/ddb/ddb.h#10 (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.38 2005/04/20 20:52:45 ps Exp $ + * $FreeBSD: src/sys/ddb/ddb.h,v 1.39 2005/07/02 23:52:37 marcel Exp $ */ /* @@ -39,6 +39,16 @@ #include <machine/db_machdep.h> /* type definitions */ +#ifndef DB_MAXARGS +#define DB_MAXARGS 10 +#endif + +#ifndef DB_CALL +#define DB_CALL db_fncall_generic +#else +int DB_CALL(db_expr_t, db_expr_t *, int, db_expr_t[]); +#endif + typedef void db_cmdfcn_t(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif); ==== //depot/projects/hammer/sys/dev/hwpmc/hwpmc_x86.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_x86.c,v 1.1 2005/06/09 19:45:07 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_x86.c,v 1.2 2005/07/03 16:33:22 jkoshy Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -91,7 +91,7 @@ #if defined(__i386__) || defined(__amd64__) case 0xF00: /* P4 */ model = ((cpu_id & 0xF0000) >> 12) | ((cpu_id & 0xF0) >> 4); - if (model >= 0 && model <= 3) /* known models */ + if (model >= 0 && model <= 4) /* known models */ cputype = PMC_CPU_INTEL_PIV; break; } ==== //depot/projects/hammer/sys/dev/ipw/if_ipw.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.4 2005/06/10 16:49:11 brooks Exp $ */ +/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.5 2005/07/03 15:42:18 damien Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.4 2005/06/10 16:49:11 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.5 2005/07/03 15:42:18 damien Exp $"); /*- * Intel(R) PRO/Wireless 2100 MiniPCI driver @@ -263,11 +263,13 @@ device_printf(dev, "could not allocate DMA resources\n"); goto fail; } + ifp = sc->sc_ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { device_printf(dev, "can not if_alloc()\n"); goto fail; } + ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; @@ -391,11 +393,11 @@ IPW_UNLOCK(sc); - if (ifp != NULL) + if (ifp != NULL) { bpfdetach(ifp); - ieee80211_ifdetach(ic); - if (ifp != NULL) + ieee80211_ifdetach(ic); if_free(ifp); + } ipw_release(sc); @@ -1018,6 +1020,10 @@ bus_addr_t physaddr; int error; + if (le32toh(status->len) < sizeof (struct ieee80211_frame_min) || + le32toh(status->len) > MCLBYTES) + return; + bus_dmamap_sync(sc->rxbuf_dmat, sbuf->map, BUS_DMASYNC_POSTREAD); bus_dmamap_unload(sc->rxbuf_dmat, sbuf->map); ==== //depot/projects/hammer/sys/dev/usb/if_ural.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.3 2005/06/10 16:49:15 brooks Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.4 2005/07/03 15:38:41 damien Exp $ */ /*- * Copyright (c) 2005 @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.3 2005/06/10 16:49:15 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.4 2005/07/03 15:38:41 damien Exp $"); /*- * Ralink Technology RT2500USB chipset driver @@ -83,10 +83,11 @@ static const struct usb_devno ural_devs[] = { { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G }, { USB_VENDOR_ASUS, USB_PRODUCT_RALINK_RT2570 }, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050 }, { USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_C54U }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLG122 }, - { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54G }, - { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54GP }, + { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54G }, + { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54GP }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_2 }, @@ -408,8 +409,13 @@ printf("%s: MAC/BBP RT2570 (rev 0x%02x), RF %s\n", USBDEVNAME(sc->sc_dev), sc->asic_rev, ural_get_rf(sc->rf_rev)); - + ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + if (ifp == NULL) { + printf("%s: can not if_alloc()\n", USBDEVNAME(sc->sc_dev)); + USB_ATTACH_ERROR_RETURN; + } + ifp->if_softc = sc; if_initname(ifp, "ural", USBDEVUNIT(sc->sc_dev)); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST | @@ -517,6 +523,7 @@ bpfdetach(ifp); ieee80211_ifdetach(ic); + if_free(ifp); mtx_destroy(&sc->sc_mtx); ==== //depot/projects/hammer/sys/dev/usb/uplcom.c#19 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/uplcom.c,v 1.28 2005/04/08 12:48:05 le Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uplcom.c,v 1.29 2005/07/03 23:51:16 hrs Exp $"); /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -231,6 +231,8 @@ { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ, -1, TYPE_PL2303 }, /* I/O DATA USB-RSAQ2 */ { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ2, -1, TYPE_PL2303 }, + /* I/O DATA USB-RSAQ3 */ + { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ3, -1, TYPE_PL2303X }, /* PLANEX USB-RS232 URS-03 */ { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A, -1, TYPE_PL2303 }, /* ST Lab USB-SERIAL-4 */ ==== //depot/projects/hammer/sys/dev/usb/usbdevs#60 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.229 2005/04/18 18:47:37 damien Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.231 2005/07/03 23:51:16 hrs Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -677,6 +677,7 @@ product BELKIN F5U208 0x0208 F5U208 VideoBus II product BELKIN F5U409 0x0409 F5U409 Serial product BELKIN F5U120 0x1203 F5U120-PC Hub +product BELKIN F5D7050 0x7050 F5D7050 wireless adapter /* Billionton products */ product BILLIONTON USB100 0x0986 USB100N 10/100 FastEthernet @@ -1314,6 +1315,7 @@ product PROLIFIC PL2305 0x2305 Parallel printer product PROLIFIC ATAPI4 0x2307 ATAPI-4 Controller product PROLIFIC PL2501 0x2501 PL2501 Host-Host interface +product PROLIFIC RSAQ3 0xaaa2 PL2303 Serial adapter (IODATA USB-RSAQ3) /* Putercom products */ product PUTERCOM UPA100 0x047e USB-1284 BRIDGE ==== //depot/projects/hammer/sys/i386/conf/NOTES#72 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1201 2005/06/21 10:17:55 dumbbell Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1202 2005/07/02 20:06:42 delphij Exp $ # # @@ -116,9 +116,6 @@ # technology which allows to restrict power consumption of the CPU by # using group of hw.crusoe.* sysctls. # -# CPU_ENABLE_SSE enables SSE/MMX2 instructions support. This is default -# on I686_CPU and above. -# # CPU_FASTER_5X86_FPU enables faster FPU exception handler. # # CPU_GEODE is for the SC1100 Geode embedded processor. This option @@ -194,7 +191,6 @@ options CPU_ELAN_PPS options CPU_ELAN_XTAL=32768000 options CPU_ENABLE_LONGRUN -options CPU_ENABLE_SSE options CPU_FASTER_5X86_FPU options CPU_GEODE options CPU_I486_ON_386 ==== //depot/projects/hammer/sys/i386/i386/dump_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.10 2005/06/29 22:28:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.11 2005/07/02 19:57:31 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -156,6 +156,7 @@ error = di->dumper(di->priv, buffer, 0, dumplo, DEV_BSIZE); dumplo += DEV_BSIZE; + fragsz = 0; return (error); } ==== //depot/projects/hammer/sys/i386/i386/initcpu.c#14 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/initcpu.c,v 1.51 2005/06/30 06:44:34 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/initcpu.c,v 1.52 2005/07/02 20:06:43 delphij Exp $"); #include "opt_cpu.h" @@ -41,12 +41,9 @@ #include <machine/md_var.h> #include <machine/specialreg.h> -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif void initializecpu(void); #if defined(I586_CPU) && defined(CPU_WT_ALLOC) ==== //depot/projects/hammer/sys/i386/i386/machdep.c#62 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.615 2005/06/29 22:28:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.616 2005/07/02 20:06:43 delphij Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -147,12 +147,9 @@ #define CS_SECURE(cs) (ISPL(cs) == SEL_UPL) #define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif static void cpu_startup(void *); static void fpstate_drop(struct thread *td); ==== //depot/projects/hammer/sys/i386/i386/pmap.c#68 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.522 2005/06/10 03:33:35 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.523 2005/07/02 20:06:43 delphij Exp $"); /* * Manages physical address maps. @@ -143,12 +143,9 @@ #include <machine/smp.h> #endif -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif #ifndef PMAP_SHPGPERPROC #define PMAP_SHPGPERPROC 200 ==== //depot/projects/hammer/sys/i386/i386/ptrace_machdep.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/ptrace_machdep.c,v 1.2 2005/06/04 15:36:48 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/ptrace_machdep.c,v 1.3 2005/07/02 20:06:43 delphij Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -35,12 +35,9 @@ #include <machine/md_var.h> #include <machine/pcb.h> -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif int cpu_ptrace(struct thread *td, int req, void *addr, int data) ==== //depot/projects/hammer/sys/i386/include/_types.h#9 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/i386/include/_types.h,v 1.11 2005/03/02 21:33:26 joerg Exp $ + * $FreeBSD: src/sys/i386/include/_types.h,v 1.12 2005/07/02 23:13:31 thompsa Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -43,6 +43,8 @@ #error this file needs sys/cdefs.h as a prerequisite #endif +#define __NO_STRICT_ALIGNMENT + /* * Basic types upon which most other types are built. */ ==== //depot/projects/hammer/sys/i386/isa/npx.c#26 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/isa/npx.c,v 1.161 2005/05/12 12:47:41 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/npx.c,v 1.162 2005/07/02 20:06:44 delphij Exp $"); #include "opt_cpu.h" #include "opt_isa.h" @@ -73,12 +73,9 @@ #include <isa/isavar.h> #endif -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif /* * 387 and 287 Numeric Coprocessor Extension (NPX) Driver. ==== //depot/projects/hammer/sys/i386/linux/linux_ptrace.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.15 2005/01/06 22:18:17 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.16 2005/07/02 20:06:44 delphij Exp $"); #include "opt_cpu.h" @@ -46,12 +46,9 @@ #include <i386/linux/linux.h> #include <i386/linux/linux_proto.h> -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif /* * Linux ptrace requests numbers. Mostly identical to FreeBSD, ==== //depot/projects/hammer/sys/ia64/ia64/db_interface.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ia64/ia64/db_interface.c,v 1.26 2005/01/06 22:18:22 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/db_interface.c,v 1.27 2005/07/02 23:52:36 marcel Exp $"); /* * Interface to DDB. @@ -46,6 +46,7 @@ #include <machine/db_machdep.h> #include <machine/frame.h> +#include <machine/md_var.h> #include <machine/mutex.h> #include <machine/setjmp.h> @@ -443,6 +444,25 @@ return (loc + slot); } +typedef db_expr_t __db_f(db_expr_t, db_expr_t, db_expr_t, db_expr_t, db_expr_t, + db_expr_t, db_expr_t, db_expr_t); + +register uint64_t __db_gp __asm__("gp"); + +int +db_fncall_ia64(db_expr_t addr, db_expr_t *rv, int nargs, db_expr_t args[]) +{ + struct ia64_fdesc fdesc; + __db_f *f; + + f = (__db_f *)&fdesc; + fdesc.func = addr; + fdesc.gp = __db_gp; /* XXX doesn't work for modules. */ + *rv = (*f)(args[0], args[1], args[2], args[3], args[4], args[5], + args[6], args[7]); + return (1); +} + void db_show_mdpcpu(struct pcpu *pc) { ==== //depot/projects/hammer/sys/ia64/ia64/dump_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.12 2005/01/06 22:18:22 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.13 2005/07/02 19:57:31 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -117,6 +117,7 @@ error = di->dumper(di->priv, buffer, 0, dumplo, DEV_BSIZE); dumplo += DEV_BSIZE; + fragsz = 0; return (error); } ==== //depot/projects/hammer/sys/ia64/ia64/machdep.c#50 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.199 2005/04/04 21:53:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.200 2005/07/05 17:12:18 marcel Exp $"); #include "opt_compat.h" #include "opt_ddb.h" >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507051820.j65IKkTh021155>