Date: Tue, 25 Mar 2003 13:52:44 -0800 (PST) From: Juli Mallett <jmallett@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 27381 for review Message-ID: <200303252152.h2PLqi5I007421@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=27381 Change 27381 by jmallett@jmallett_dalek on 2003/03/25 13:51:51 IFC. Affected files ... .. //depot/projects/mips/contrib/gdtoa/README#3 integrate .. //depot/projects/mips/contrib/gdtoa/g__fmt.c#3 integrate .. //depot/projects/mips/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/mips/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/mips/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/mips/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/mips/etc/printcap#2 integrate .. //depot/projects/mips/lib/libatm/Makefile#3 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#20 integrate .. //depot/projects/mips/sbin/atm/ilmid/ilmid.c#4 integrate .. //depot/projects/mips/sbin/mknod/mknod.8#3 integrate .. //depot/projects/mips/share/man/man4/bge.4#3 integrate .. //depot/projects/mips/share/man/man4/iir.4#3 integrate .. //depot/projects/mips/share/man/man4/man4.i386/cx.4#2 integrate .. //depot/projects/mips/share/man/man4/man4.i386/dgb.4#2 integrate .. //depot/projects/mips/share/man/man9/style.9#6 integrate .. //depot/projects/mips/sys/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/mips/sys/kern/kern_subr.c#7 integrate Differences ... ==== //depot/projects/mips/contrib/gdtoa/README#3 (text+ko) ==== @@ -320,7 +320,4 @@ Please send comments to David M. Gay - Bell Labs, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636, U.S.A. - dmg@research.bell-labs.com + dmg@acm.org ==== //depot/projects/mips/contrib/gdtoa/g__fmt.c#3 (text+ko) ==== @@ -28,11 +28,7 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" ==== //depot/projects/mips/contrib/gdtoa/gethex.c#2 (text+ko) ==== @@ -28,15 +28,15 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" +#ifdef USE_LOCALE +#include "locale.h" +#endif + int #ifdef KR_headers gethex(sp, fpi, exp, bp, sign) @@ -50,6 +50,11 @@ int esign, havedig, irv, k, n, nbits, up; ULong L, lostbits, *x; Long e, e1; +#ifdef USE_LOCALE + char decimalpoint = *localeconv()->decimal_point; +#else +#define decimalpoint '.' +#endif if (!hexdig['0']) hexdig_init_D2A(); @@ -61,7 +66,7 @@ s = s0; decpt = 0; if (!hexdig[*s]) { - if (*s == '.') { + if (*s == decimalpoint) { decpt = ++s; if (!hexdig[*s]) goto ret0; @@ -80,7 +85,7 @@ } while(hexdig[*s]) s++; - if (*s == '.' && !decpt) { + if (*s == decimalpoint && !decpt) { decpt = ++s; while(hexdig[*s]) s++; @@ -120,7 +125,7 @@ n = 0; L = 0; while(s1 > s0) { - if (*--s1 == '.') + if (*--s1 == decimalpoint) continue; if (n == 32) { *x++ = L; ==== //depot/projects/mips/contrib/gdtoa/strtod.c#3 (text+ko) ==== @@ -28,11 +28,7 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" @@ -118,7 +114,7 @@ switch(s[1]) { case 'x': case 'X': - switch(gethex(&s, &fpi, &exp, &bb, sign)) { + switch(i = gethex(&s, &fpi, &exp, &bb, sign)) { case STRTOG_NoNumber: s = s00; sign = 0; ==== //depot/projects/mips/contrib/gdtoa/strtodg.c#3 (text+ko) ==== @@ -28,11 +28,7 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" ==== //depot/projects/mips/contrib/gdtoa/xsum0.out#3 (text+ko) ==== @@ -1,9 +1,9 @@ -README 7150e50 13249 +README c9c34c1 13153 arithchk.c e37b8a75 4070 dmisc.c e8d262b6 4712 dtoa.c f3c132b3 16905 g_Qfmt.c e5847e9 2870 -g__fmt.c e29d67f1 2534 +g__fmt.c ee5f9be0 2439 g_ddfmt.c fcf94527 3790 g_dfmt.c f30e55a9 2533 g_ffmt.c 7c4ea96 2459 @@ -12,7 +12,7 @@ gdtoa.c 364a0d2 17017 gdtoa.h 1eb440de 4810 gdtoaimp.h 6a955ba 19106 -gethex.c ff3c434d 4981 +gethex.c 1310d1b3 5066 gmisc.c e1a268ea 2114 hd_init.c cf9a94e 1827 hexnan.c f53be1da 2988 @@ -26,9 +26,9 @@ strtoIg.c ec59c2fa 3484 strtoIx.c 8f8c9d 1990 strtoIxL.c 1313ff7f 1961 -strtod.c 1ad667 20076 +strtod.c fd6556c8 19985 strtodI.c e58338e0 4062 -strtodg.c 1caf3fa4 19553 +strtodg.c e04b9254 19458 strtof.c 1e7a787a 2202 strtopQ.c e232c542 2685 strtopd.c e865dc64 1701 ==== //depot/projects/mips/etc/printcap#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)printcap 5.3 (Berkeley) 6/30/90 -# $FreeBSD: src/etc/printcap,v 1.12 2002/07/31 10:05:37 blackend Exp $ +# $FreeBSD: src/etc/printcap,v 1.13 2003/03/25 18:03:11 trhodes Exp $ # # This enables a simple local "raw" printer, hooked up to the first @@ -22,7 +22,7 @@ # # Do also refer to the "printing" section of the handbook. # -# http://www.freebsd.org/doc/handbook/printing.html +# http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/printing.html # # A local copy can be found under # ==== //depot/projects/mips/lib/libatm/Makefile#3 (text+ko) ==== @@ -23,7 +23,7 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.5 2003/03/25 04:29:26 mdodd Exp $ +# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.6 2003/03/25 17:40:00 mdodd Exp $ # # @@ -33,6 +33,6 @@ LDADD+= -lmd DPADD+= ${LIBMD} -WARNS?= 5 +WARNS?= 3 .include <bsd.lib.mk> ==== //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#20 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The FreeBSD Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.524 2003/03/22 04:37:16 hrs Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.527 2003/03/25 20:21:20 olgeni Exp $</pubdate> <copyright> <year>2000</year> @@ -183,7 +183,7 @@ default. This change greatly decreases the need for a static, centralized table of major number assignments to device drivers (a few drivers retain their old static major numbers for - compatability), and also reduces the possibility of running out + compatibility), and also reduces the possibility of running out of device major numbers.</para> <sect3> @@ -323,7 +323,7 @@ <para>A number of changes have been made to the &man.cd.4; driver. The primary user-visible change is improved - compatability with ATAPI/USB/Firewire CDROM drives.</para> + compatibility with ATAPI/USB/Firewire CDROM drives.</para> <para>&man.geom.4; is now mandatory; the <literal>NO_GEOM</literal> has been removed from the set of @@ -513,7 +513,8 @@ the <quote>Don't Fragment</quote> bit on outgoing packets.</para> <para>&man.ping.8; now supports a <option>-M</option> option to use - ICMP mask request or timestamp request messages instead of ICMP echo requests.</para> + ICMP mask request or timestamp request messages instead of ICMP + echo requests.</para> <para>&man.ping.8; now supports a <option>-z</option> flag to set the Type of Service bits in outgoing packets.</para> @@ -580,7 +581,7 @@ <para><application>FILE</application> has been updated to 3.41. &merged;</para> - <para><application>GCC</application> has been updated to + <para><application>GCC</application> has been updated to 3.2.2 (release version).</para> <para>The <application>ISC DHCP</application> client has been @@ -590,7 +591,7 @@ form of <application>KTH eBones</application>) has been removed. Users requiring this functionality can still get it from the <filename role="port">security/krb4</filename> port - (or package). Kerberos IV compatability mode for Kerberos 5 + (or package). Kerberos IV compatibility mode for Kerberos 5 has been removed, and the <literal>k5<replaceable>program</replaceable></literal> userland utilities have been renamed to ==== //depot/projects/mips/sbin/atm/ilmid/ilmid.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.14 2003/01/01 18:48:45 schweikh Exp $ + * @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.18 2003/03/25 20:34:46 mdodd Exp $ * */ @@ -73,7 +73,7 @@ #include <unistd.h> #ifndef lint -__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.14 2003/01/01 18:48:45 schweikh Exp $"); +__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.18 2003/03/25 20:34:46 mdodd Exp $"); #endif @@ -92,7 +92,15 @@ #define ASN_IPADDR 0x40 #define ASN_TIMESTAMP 0x43 -static char *Var_Types[] = { "", "", "ASN_INTEGER", "", "ASN_OCTET", "ASN_NULL", "ASN_OBJID" }; +static char *Var_Types[] = { + "", + "", + "ASN_INTEGER", + "", + "ASN_OCTET", + "ASN_NULL", + "ASN_OBJID" +}; /* * Define SNMP PDU types @@ -103,8 +111,15 @@ #define PDU_TYPE_SET 0xA3 #define PDU_TYPE_TRAP 0xA4 -static char *PDU_Types[] = { "GET REQUEST", "GETNEXT REQUEST", "GET RESPONSE", "SET REQUEST", - "TRAP" }; +static char *PDU_Types[] = { + "GET REQUEST", + "GETNEXT REQUEST", + "GET RESPONSE", + "SET REQUEST", + "TRAP", + " ?? ", + " ??? " +}; /* * Define TRAP codes @@ -235,7 +250,7 @@ {{ 9, 43, 6, 1, 4, 1, 353, 2, 7, 1 }}, #define MY_OBJID 11 {{ 7, 43, 6, 1, 4, 1, 9999, 1 }}, -#define SETPFX_OBJID 12 +#define SETPFX_OBJID 12 /* ATM Forum says 1=valid, 2=invalid, not 0! */ {{ 12, 43, 6, 1, 4, 1, 353, 2, 7, 1, 1, 3, 0 }}, #define ENTERPRISE_OBJID 13 {{ 8, 43, 6, 1, 4, 1, 3, 1, 1 }}, @@ -243,6 +258,8 @@ {{ 10, 43, 6, 1, 4, 1, 353, 2, 1, 4, 0 }}, #define ATMF_SYSID 15 {{ 12, 43, 6, 1, 4, 1, 353, 2, 1, 1, 1, 8, 0 }}, +#define MADGE_OBJECT1 16 /* I don't have a clue ... -RH */ + {{ 9, 43, 6, 1, 4, 1, 353, 2, 7, 99 }}, }; #define NUM_OIDS (sizeof(Objids)/sizeof(Objid)) @@ -270,6 +287,14 @@ ILMI_RUNNING /* Normal processing */ }; +static char *ILMI_State[] = { + "UNKNOWN", + "COLDSTART", + "INIT", + "REG", + "RUNNING" +}; + /* * Our (incrementing) Request ID */ @@ -1239,7 +1264,7 @@ /* Error Index */ *bp++ = ASN_INTEGER; *bp++ = 0x01; /* length = 1 */ - *bp++ = erridx; /* index - 0 if no error */ + *bp++ = erridx; /* index == 0 if no error */ } else { /* type == PDU_TYPE_TRAP */ @@ -2091,11 +2116,34 @@ { Variable *var; int idx; + int x; + int oidlen; var = hdr->head; while ( var ) { + + /* Handle the 'GET PREFIX' request */ + oidlen = Objids[SETPFX_OBJID].oid[0]; + if (oid_ncmp(&var->oid, &Objids[SETPFX_OBJID], oidlen) == 0) { + var->var.ival = 2; /* assume not valid */ + for(x = 0; x < 13; x++) + if (var->oid.oid[oidlen + x + 2] != + addressEntry[intf].oid[x + 1]) + break; + + /* Address Match */ + if (x == 13) + hdr->head->var.ival = 1; + var = var->next; + continue; + } + idx = find_var ( var ); switch ( idx ) { + case MADGE_OBJECT1: + /* reply with NO SUCH OBJECT */ + var->type = ASN_NULL; + break; case SYS_OBJID: var->type = ASN_OBJID; bcopy ( (caddr_t)&Objids[MY_OBJID], @@ -2167,6 +2215,138 @@ } +/****************************************************************************** + * + * Find an OBJID from known ones + * + * in: Variable with valid OID + * out: OID number (index), -1 = not found + */ +static int +lmi_object_find(Variable *var) +{ + Objid * obj_var; + Objid * obj_cur; + int x; + int y; + + obj_var = &var->oid; + + for (x = 0; x < NUM_OIDS; x++) { + obj_cur = &Objids[x]; + for (y = 0; y < 128; y++) { + if (obj_var->oid[y] != obj_cur->oid[y]) + break; + if (obj_var->oid[y] == 0) /* object ID endmark */ + return (x); + } + } + + return (-1); +} + +/****************************************************************************** + * + * Append instance number to OID + * + * in: Variable, instance number + * out: zero = success + * + */ +static int +lmi_object_instance(Variable *var, int instnum) +{ + int * oidptr; + int curlen; + + oidptr = var->oid.oid; + curlen = oidptr[0]; /* current length */ + if (curlen > 126) + return (1); + curlen++; + oidptr[curlen] = instnum; + oidptr[0] = curlen; + return (0); +} + +/****************************************************************************** + * + * Handle received GETNEXT + * + * in: Header with valid fields, interface number + * out: zero = success + * + */ +static int +lmi_rcvcmd_getnext(Snmp_Header *header, int intf) +{ + int * oidptr; + int oidlen; + int oidnum; + int x; + + oidnum = lmi_object_find(header->head); + oidptr = header->head->oid.oid; + oidlen = oidptr[0]; + + switch(oidnum) { + /* Should be because the remote side is attempting + * to verify that our table is empty + */ + case ADDRESS_OBJID: + if ( addressEntry[intf].oid[0] ) { + /* XXX - FIXME */ + /* Our table is not empty - return address */ + } + break; + + /* Madge Collage sends GETNEXT for this */ + case SETPFX_OBJID: + if(addressEntry[intf].oid[0]) { /* we have a prefix */ + oidptr[0] += 14; + oidptr += oidlen; /* skip to last number */ + oidptr++; + *oidptr++ = 13; /* length of prefix */ + + /* fill in the prefix */ + for(x = 0; x < 13; x++) { + *oidptr++ = addressEntry[intf].oid[x+1]; + } + header->head->type = ASN_INTEGER; + /* 1=valid, 2=invalid -- only 2 values */ + header->head->var.ival = 1; + } else { /* no prefix available */ + header->head->type = ASN_NULL; + } + break; + + default: + return (1); /* unknown object ID */ + } + + build_pdu(header, PDU_TYPE_GETRESP); + send_resp(intf, header, Resp_Buf); + + return (0); +} + + +/****************************************************************************** + * + * Handle received TRAP + * + * in: Header with valid fields, interface number + * out: zero = success + * + */ +static int +lmi_rcvcmd_trap(Snmp_Header *header, int intf) +{ + + bzero((caddr_t)&addressEntry[intf], sizeof(Objid)); + return (0); +} + /* * ILMI State Processing Loop * @@ -2321,20 +2501,7 @@ /* The only messages we care about are GETNEXTs, GETRESPs, and TRAPs */ switch ( Hdr->pdutype ) { case PDU_TYPE_GETNEXT: - /* - * Should be because the remote side is attempting - * to verify that our table is empty - */ - if ( oid_ncmp ( (caddr_t)&Hdr->head->oid, - (caddr_t)&Objids[ADDRESS_OBJID], - Objids[ADDRESS_OBJID].oid[0] ) == 0 ) { - if ( addressEntry[intf].oid[0] ) { - /* XXX - FIXME */ - /* Our table is not empty - return address */ - } - } - build_pdu ( Hdr, PDU_TYPE_GETRESP ); - send_resp ( intf, Hdr, Resp_Buf ); + lmi_rcvcmd_getnext(Hdr, intf); break; case PDU_TYPE_GETRESP: /* @@ -2396,6 +2563,7 @@ break; case PDU_TYPE_TRAP: /* Remote side wants us to start fresh */ + lmi_rcvcmd_trap(Hdr, intf); free_pdu ( Hdr ); break; default: @@ -2417,8 +2585,7 @@ free_pdu ( Hdr ); break; case PDU_TYPE_GETNEXT: - build_pdu ( Hdr, PDU_TYPE_GETRESP ); - send_resp ( intf, Hdr, Resp_Buf ); + lmi_rcvcmd_getnext(Hdr, intf); break; case PDU_TYPE_SET: /* Look for SET_PREFIX Objid */ @@ -2436,6 +2603,7 @@ } break; case PDU_TYPE_TRAP: + lmi_rcvcmd_trap(Hdr, intf); free_pdu ( Hdr ); break; } ==== //depot/projects/mips/sbin/mknod/mknod.8#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mknod.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.24 2003/02/24 22:54:26 ru Exp $ +.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.25 2003/03/25 18:43:10 trhodes Exp $ .\" .Dd December 11, 1993 .Dt MKNOD 8 @@ -48,13 +48,6 @@ The .Nm utility creates device special files. -Normally the shell script -.Pa /dev/MAKEDEV -is used to create special files for commonly known devices; it executes -.Nm -with the appropriate arguments and can make all the files required for the -device. -.Pp To make nodes manually, the four required arguments are: .Pp .Bl -tag -width indent @@ -78,8 +71,6 @@ The major device number is an integer number which tells the kernel which device driver entry point to use. To learn what major device number to use for a particular device, check -.Pa /dev/MAKEDEV -or .Pa /usr/src/sys/conf/majors . .It Ar minor The minor device number tells the kernel which subunit @@ -116,17 +107,11 @@ The .Xr chown 8 Ns - Ns like functionality is specific to -.Fx -and was added so that -.Pa /dev/MAKEDEV -would not depend on -.Pa /usr -being mounted. +.Fx . .Sh SEE ALSO .Xr mkfifo 1 , .Xr mknod 2 , -.Xr chown 8 , -.Xr MAKEDEV 8 +.Xr chown 8 .Sh HISTORY A .Nm ==== //depot/projects/mips/share/man/man4/bge.4#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/bge.4,v 1.6 2003/02/15 17:12:53 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/bge.4,v 1.7 2003/03/25 18:08:57 ps Exp $ .\" .Dd September 27, 2001 .Dt BGE 4 @@ -55,6 +55,12 @@ .It IBM x235 server integrated BCM5703x NIC (10/100/1000baseTX) .It +HP ProLiant NC7760 embedded Gigabit NIC (10/100/1000baseTX) +.It +HP ProLiant NC7770 PCI-X Gigabit NIC (10/100/1000baseTX) +.It +HP ProLiant NC7781 embedded PCI-X Gigabit NIC (10/100/1000baseTX) +.It Netgear GA302T (10/100/1000baseTX) .It SysKonnect SK-9D21 (10/100/1000baseTX) @@ -123,11 +129,9 @@ .Cm half-duplex modes. .It Cm 1000baseTX -Set 1000baseTX operation over twisted pair. +Set 1000baseTX operation over twisted pair. Only .Cm full-duplex -and -.Cm half-duplex -modes are supported. +mode is supported. .It Cm 1000baseSX Set 1000Mbps (gigabit ethernet) operation. Both ==== //depot/projects/mips/share/man/man4/iir.4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/iir.4,v 1.2 2003/02/24 22:53:22 ru Exp $ +.\" $FreeBSD: src/share/man/man4/iir.4,v 1.3 2003/03/25 18:13:20 trhodes Exp $ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" @@ -62,7 +62,7 @@ This manual page was written by .An Tom Rhodes Aq trhodes@FreeBSD.org and is based on information supplied by the driver authors and the website of -.An Mike Smith Aq msith@FreeBSD.org . +.An Mike Smith Aq msmith@FreeBSD.org . .Sh BUGS During a .Fx ==== //depot/projects/mips/share/man/man4/man4.i386/cx.4#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.14 2001/10/13 09:08:36 yokota Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.15 2003/03/25 18:08:50 trhodes Exp $ .\" .Dd December 12, 1994 .Dt CX 4 i386 @@ -77,16 +77,6 @@ The channels which have the RS-232 interface can be used both in synchronous and asynchronous modes (software selectable by cxconfig utility) and hence are called ``universal'' channels. -.Pp -The special device files, -.Pa /dev/* , -for the adapter Cronyx-Sigma -are created by th -.Xr MAKEDEV 8 -An example: -.Bd -literal -cd /dev -sh MAKEDEV cronyx ttyx0 ttyx1 ttyy0 .Ed .Sh "Asynchronous driver" The asynchronous channel device files have the names: ==== //depot/projects/mips/share/man/man4/man4.i386/dgb.4#2 (text+ko) ==== @@ -35,7 +35,7 @@ .\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91 .\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp .\" from: sio.4,v 1.15 1994/12/06 20:14:30 bde Exp -.\" $FreeBSD: src/share/man/man4/man4.i386/dgb.4,v 1.19 2001/07/14 19:41:04 schweikh Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/dgb.4,v 1.20 2003/03/25 18:08:50 trhodes Exp $ .\" .Dd October 13, 1995 .Dt DGB 4 i386 @@ -354,8 +354,7 @@ .Xr stty 1 , .Xr termios 4 , .Xr tty 4 , -.Xr comcontrol 8 , -.Xr MAKEDEV 8 +.Xr comcontrol 8 .\" XXX add next line to many other drivers. .Sh HISTORY The ==== //depot/projects/mips/share/man/man9/style.9#6 (text+ko) ==== @@ -43,7 +43,7 @@ * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). * * @(#)style 1.14 (Berkeley) 4/28/95 - * $FreeBSD: src/share/man/man9/style.9,v 1.99 2003/03/25 16:36:47 jhb Exp $ + * $FreeBSD: src/share/man/man9/style.9,v 1.100 2003/03/25 19:46:55 jhb Exp $ */ /* @@ -82,11 +82,11 @@ #if 0 #ifndef lint static char sccsid[] = "@(#)style 1.14 (Berkeley) 4/28/95"; -#endif /* !lint */ +#endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.99 2003/03/25 16:36:47 jhb Exp $"); +__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.100 2003/03/25 19:46:55 jhb Exp $"); .Ed .Pp Leave another blank line before the header files. ==== //depot/projects/mips/sys/i386/linux/linux_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.36 2003/03/18 08:45:23 phk Exp $ + * $FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.37 2003/03/25 20:02:55 mdodd Exp $ */ #include <sys/param.h> @@ -442,7 +442,9 @@ long pad; off_t pos; } */ bsd_args; + int error; + error = 0; bsd_args.flags = 0; if (linux_args->flags & LINUX_MAP_SHARED) bsd_args.flags |= MAP_SHARED; @@ -530,12 +532,18 @@ #ifdef DEBUG if (ldebug(mmap)) - printf("-> (%p, %d, %d, 0x%08x, %d, %d)\n", + printf("-> %s(%p, %d, %d, 0x%08x, %d, 0x%x)\n", + __func__, (void *)bsd_args.addr, bsd_args.len, bsd_args.prot, bsd_args.flags, bsd_args.fd, (int)bsd_args.pos); #endif - - return (mmap(td, &bsd_args)); + error = mmap(td, &bsd_args); +#ifdef DEBUG + if (ldebug(mmap)) + printf("-> %s() return: 0x%x (0x%08x)\n", + __func__, error, (u_int)td->td_retval[0]); +#endif + return (error); } int ==== //depot/projects/mips/sys/kern/kern_subr.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_subr.c,v 1.72 2003/03/08 06:58:17 ken Exp $ + * $FreeBSD: src/sys/kern/kern_subr.c,v 1.73 2003/03/25 20:13:24 jhb Exp $ */ #include "opt_zero.h" @@ -185,8 +185,6 @@ n -= cnt; } out: - if (td != curthread) printf("uiomove: IT CHANGED!"); - td = curthread; /* Might things have changed in copyin/copyout? */ if (td) { mtx_lock_spin(&sched_lock); td->td_flags = (td->td_flags & ~TDF_DEADLKTREAT) | save; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the messagehelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303252152.h2PLqi5I007421>