Date: Wed, 10 Apr 2002 12:15:22 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9528 for review Message-ID: <200204101915.g3AJFMU67599@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9528 Change 9528 by peter@peter_daintree on 2002/04/10 12:14:57 IFC @9518 Affected files ... ... //depot/projects/ia64/include/arpa/inet.h#7 integrate ... //depot/projects/ia64/lib/libmd/Makefile#2 integrate ... //depot/projects/ia64/sys/alpha/include/ansi.h#6 integrate ... //depot/projects/ia64/sys/alpha/include/endian.h#4 integrate ... //depot/projects/ia64/sys/conf/NOTES#4 integrate ... //depot/projects/ia64/sys/dev/ata/ata-all.c#12 integrate ... //depot/projects/ia64/sys/dev/ata/ata-raid.c#8 integrate ... //depot/projects/ia64/sys/dev/digi/digi.c#8 integrate ... //depot/projects/ia64/sys/dev/digi/digi.h#4 integrate ... //depot/projects/ia64/sys/dev/digi/digi_isa.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/umass.c#8 integrate ... //depot/projects/ia64/sys/i386/include/ansi.h#6 integrate ... //depot/projects/ia64/sys/i386/include/endian.h#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/exception.s#11 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#14 integrate ... //depot/projects/ia64/sys/ia64/include/ansi.h#6 integrate ... //depot/projects/ia64/sys/ia64/include/endian.h#4 integrate ... //depot/projects/ia64/sys/netinet/in.h#8 integrate ... //depot/projects/ia64/sys/netinet6/in6.h#4 integrate ... //depot/projects/ia64/sys/powerpc/include/ansi.h#6 integrate ... //depot/projects/ia64/sys/powerpc/include/endian.h#4 integrate ... //depot/projects/ia64/sys/sparc64/include/ansi.h#6 integrate ... //depot/projects/ia64/sys/sparc64/include/endian.h#4 integrate ... //depot/projects/ia64/sys/sys/param.h#8 integrate ... //depot/projects/ia64/sys/sys/types.h#9 integrate ... //depot/projects/ia64/usr.bin/find/find.1#4 integrate ... //depot/projects/ia64/usr.bin/renice/renice.8#2 integrate ... //depot/projects/ia64/usr.bin/renice/renice.c#4 integrate ... //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#5 integrate Differences ... ==== //depot/projects/ia64/include/arpa/inet.h#7 (text+ko) ==== @@ -50,7 +50,7 @@ * * @(#)inet.h 8.1 (Berkeley) 6/2/93 * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.21 2002/04/01 08:12:21 mike Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.22 2002/04/10 10:51:53 mike Exp $ */ #ifndef _ARPA_INET_H_ @@ -64,13 +64,8 @@ /* Required for byteorder(3) functions. */ #include <machine/endian.h> -#ifndef INET_ADDRSTRLEN #define INET_ADDRSTRLEN 16 -#endif - -#ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 -#endif #ifndef _UINT16_T_DECLARED typedef __uint16_t uint16_t; @@ -116,7 +111,7 @@ #endif /* XXX all new diversions!! argh!! */ -#ifndef _POSIX_SOURCE +#if __BSD_VISIBLE #define inet_addr __inet_addr #define inet_aton __inet_aton #define inet_lnaof __inet_lnaof @@ -131,7 +126,7 @@ #define inet_ntop __inet_ntop #define inet_nsap_addr __inet_nsap_addr #define inet_nsap_ntoa __inet_nsap_ntoa -#endif /* !_POSIX_SOURCE */ +#endif /* __BSD_VISIBLE */ __BEGIN_DECLS #ifndef _BYTEORDER_PROTOTYPED @@ -147,8 +142,7 @@ const char *inet_ntop(int, const void *, char *, socklen_t); int inet_pton(int, const char *, void *); -/* Nonstandard functions. */ -#ifndef _POSIX_SOURCE +#if __BSD_VISIBLE int ascii2addr(int, const char *, void *); char *addr2ascii(int, const void *, int, char *); int inet_aton(const char *, struct in_addr *); @@ -161,7 +155,7 @@ int inet_net_pton(int, const char *, void *, size_t); unsigned inet_nsap_addr(const char *, unsigned char *, int); char *inet_nsap_ntoa(int, const unsigned char *, char *); -#endif /* !_POSIX_SOURCE */ +#endif /* __BSD_VISIBLE */ __END_DECLS #ifndef _BYTEORDER_FUNC_DEFINED ==== //depot/projects/ia64/lib/libmd/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libmd/Makefile,v 1.36 2001/03/27 17:27:06 ru Exp $ +# $FreeBSD: src/lib/libmd/Makefile,v 1.37 2002/04/10 17:01:55 ru Exp $ LIB= md SRCS= md2c.c md4c.c md5c.c md2hl.c md4hl.c md5hl.c \ @@ -43,8 +43,6 @@ .endif .endif -all: md2.3 md4.3 md5.3 - md2hl.c: mdXhl.c (echo '#define LENGTH 16'; \ sed -e 's/mdX/md2/g' -e 's/MDX/MD2/g' ${.ALLSRC}) > ${.TARGET} @@ -73,17 +71,11 @@ -e 's/RIPEMD160__/RIPEMD160_/g' \ ${.ALLSRC}) > ${.TARGET} -md2.3: ${.CURDIR}/mdX.3 - sed -e 's/mdX/md2/g' -e 's/MDX/MD2/g' ${.ALLSRC} > ${.TARGET} - cat ${.CURDIR}/md2.copyright >> ${.TARGET} - -md4.3: ${.CURDIR}/mdX.3 - sed -e 's/mdX/md4/g' -e 's/MDX/MD4/g' ${.ALLSRC} > ${.TARGET} - cat ${.CURDIR}/md4.copyright >> ${.TARGET} - -md5.3: ${.CURDIR}/mdX.3 - sed -e 's/mdX/md5/g' -e 's/MDX/MD5/g' ${.ALLSRC} > ${.TARGET} - cat ${.CURDIR}/md5.copyright >> ${.TARGET} +.for i in 2 4 5 +md${i}.3: ${.CURDIR}/mdX.3 + sed -e "s/mdX/md${i}/g" -e "s/MDX/MD${i}/g" ${.ALLSRC} > ${.TARGET} + cat ${.CURDIR}/md${i}.copyright >> ${.TARGET} +.endfor md2.ref: echo 'MD2 test suite:' > ${.TARGET} ==== //depot/projects/ia64/sys/alpha/include/ansi.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.26 2002/03/24 11:25:44 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.27 2002/04/10 15:58:11 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -53,6 +53,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ +#define _BSD_SEGSZ_T_ __int64_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned long /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t /* socklen_t (duh) */ #define _BSD_SSIZE_T_ long /* byte count or error */ ==== //depot/projects/ia64/sys/alpha/include/endian.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.9 2002/03/09 21:02:11 mike Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.10 2002/04/10 14:39:12 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -46,17 +46,26 @@ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ +#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ +#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ +#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ + +#define _BYTE_ORDER _LITTLE_ENDIAN -#define BYTE_ORDER LITTLE_ENDIAN -#endif /* !_POSIX_SOURCE */ +/* + * Deprecated variants that don't have enough underscores to be useful in more + * strict namespaces. + */ +#if __BSD_VISIBLE +#define LITTLE_ENDIAN _LITTLE_ENDIAN +#define BIG_ENDIAN _BIG_ENDIAN +#define PDP_ENDIAN _PDP_ENDIAN +#define BYTE_ORDER _BYTE_ORDER +#endif #ifdef __GNUC__ ==== //depot/projects/ia64/sys/conf/NOTES#4 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys/<arch>/conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1019 2002/04/09 18:26:49 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1020 2002/04/10 17:27:52 brian Exp $ # # @@ -1767,7 +1767,7 @@ hint.digi.0.at="isa" hint.digi.0.port="0x104" hint.digi.0.maddr="0xd0000" -# BIOS & FEP/OS components of device digi. Normally left as modules +# BIOS & FEP/OS components of device digi. device digi_CX device digi_CX_PCI device digi_EPCX ==== //depot/projects/ia64/sys/dev/ata/ata-all.c#12 (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/dev/ata/ata-all.c,v 1.148 2002/04/05 18:37:04 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.149 2002/04/10 11:18:07 sos Exp $ */ #include "opt_ata.h" @@ -406,7 +406,7 @@ iocmd->u.enclosure.temp = temp; iocmd->u.enclosure.v05 = ata_drawersensor(atadev, 0, 0x23, 0) * 27; iocmd->u.enclosure.v12 = ata_drawersensor(atadev, 0, 0x24, 0) * 61; - + ATA_UNLOCK_CH(ch); return 0; } ==== //depot/projects/ia64/sys/dev/ata/ata-raid.c#8 (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/dev/ata/ata-raid.c,v 1.44 2002/04/02 13:47:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.45 2002/04/10 11:18:07 sos Exp $ */ #include "opt_ata.h" @@ -97,11 +97,12 @@ continue; for (disk = 0; disk < rdp->total_disks; disk++) { - if (rdp->disks[disk].device == adp->device) { + if ((rdp->disks[disk].flags & AR_DF_ASSIGNED) && + rdp->disks[disk].device == adp->device) { ata_prtdev(rdp->disks[disk].device, "inserted into ar%d disk%d as spare\n", array, disk); - rdp->disks[disk].flags = (AR_DF_PRESENT | AR_DF_SPARE); + rdp->disks[disk].flags |= (AR_DF_PRESENT | AR_DF_SPARE); AD_SOFTC(rdp->disks[disk])->flags = AD_F_RAID_SUBDISK; ar_config_changed(rdp, 1); return 1; @@ -216,18 +217,19 @@ } printf(" subdisks:\n"); for (disk = 0; disk < rdp->total_disks; disk++) { - if (rdp->disks[disk].flags & AR_DF_ONLINE) - printf(" %d READY ", disk); + if (rdp->disks[disk].flags & AR_DF_PRESENT) { + if (rdp->disks[disk].flags & AR_DF_ONLINE) + printf(" %d READY ", disk); + else if (rdp->disks[disk].flags & AR_DF_SPARE) + printf(" %d SPARE ", disk); + else + printf(" %d FREE ", disk); + ad_print(AD_SOFTC(rdp->disks[disk])); + } else if (rdp->disks[disk].flags & AR_DF_ASSIGNED) - printf(" %d DOWN ", disk); - else if (rdp->disks[disk].flags & AR_DF_SPARE) - printf(" %d SPARE ", disk); - else if (rdp->disks[disk].flags & AR_DF_PRESENT) - printf(" %d FREE ", disk); + printf(" %d DOWN\n", disk); else printf(" %d INVALID no RAID config info on this disk\n", disk); - if (rdp->disks[disk].flags & AR_DF_PRESENT) - ad_print(AD_SOFTC(rdp->disks[disk])); } } @@ -286,7 +288,8 @@ break; } if (rdp->flags & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID) && - (rdp->flags & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID)) != ctlr){ + (rdp->flags & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID)) != + (ctlr & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID))) { free(rdp, M_AR); return EXDEV; } @@ -555,7 +558,8 @@ switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { case AR_F_SPAN: case AR_F_RAID0: - if (rdp->disks[buf1->drive].flags & AR_DF_ONLINE && + if ((rdp->disks[buf1->drive].flags & + (AR_DF_PRESENT|AR_DF_ONLINE))==(AR_DF_PRESENT|AR_DF_ONLINE) && !AD_SOFTC(rdp->disks[buf1->drive])->dev->si_disk) { rdp->disks[buf1->drive].flags &= ~AR_DF_ONLINE; ar_config_changed(rdp, 1); @@ -579,12 +583,14 @@ tsleep(rdp, PRIBIO, "arwait", 0); } } - if (rdp->disks[buf1->drive].flags & AR_DF_ONLINE && + if ((rdp->disks[buf1->drive].flags & + (AR_DF_PRESENT|AR_DF_ONLINE))==(AR_DF_PRESENT|AR_DF_ONLINE) && !AD_SOFTC(rdp->disks[buf1->drive])->dev->si_disk) { rdp->disks[buf1->drive].flags &= ~AR_DF_ONLINE; change = 1; } - if (rdp->disks[buf1->drive + rdp->width].flags & AR_DF_ONLINE && + if ((rdp->disks[buf1->drive + rdp->width].flags & + (AR_DF_PRESENT|AR_DF_ONLINE))==(AR_DF_PRESENT|AR_DF_ONLINE) && !AD_SOFTC(rdp->disks[buf1->drive + rdp->width])->dev->si_disk) { rdp->disks[buf1->drive + rdp->width].flags &= ~AR_DF_ONLINE; change = 1; @@ -727,6 +733,10 @@ rdp->flags |= AR_F_READY; rdp->flags &= ~AR_F_DEGRADED; + for (disk = 0; disk < rdp->total_disks; disk++) + if (!(rdp->disks[disk].flags & AR_DF_PRESENT)) + rdp->disks[disk].flags &= ~AR_DF_ONLINE; + for (disk = 0; disk < rdp->total_disks; disk++) { switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { case AR_F_SPAN: @@ -1228,12 +1238,12 @@ raid->disks[disk].flags |= AR_DF_ONLINE; if (info->raid.disk[disk].flags & PR_F_ASSIGNED) raid->disks[disk].flags |= AR_DF_ASSIGNED; - if (info->raid.disk[disk].flags & PR_F_SPARE) + if (info->raid.disk[disk].flags & PR_F_SPARE) { + raid->disks[disk].flags &= ~AR_DF_ONLINE; raid->disks[disk].flags |= AR_DF_SPARE; - if (info->raid.disk[disk].flags & (PR_F_REDIR | PR_F_DOWN)) { + } + if (info->raid.disk[disk].flags & (PR_F_REDIR | PR_F_DOWN)) raid->disks[disk].flags &= ~AR_DF_ONLINE; - raid->disks[disk].flags |= AR_DF_PRESENT; - } } if (!disksum) { free(raidp[array], M_AR); @@ -1285,18 +1295,8 @@ config->magic_0 = PR_MAGIC0(rdp->disks[disk]) | timestamp.tv_sec; config->magic_1 = timestamp.tv_sec >> 16; config->magic_2 = timestamp.tv_sec; - config->raid.integrity = PR_I_VALID; - config->raid.flags = 0; - if (rdp->disks[disk].flags & AR_DF_PRESENT) - config->raid.flags |= PR_F_VALID; - if (rdp->disks[disk].flags & AR_DF_ASSIGNED) - config->raid.flags |= PR_F_ASSIGNED; - if (rdp->disks[disk].flags & AR_DF_ONLINE) - config->raid.flags |= PR_F_ONLINE; - else - config->raid.flags |= PR_F_DOWN; config->raid.disk_number = disk; if (rdp->disks[disk].flags & AR_DF_PRESENT && rdp->disks[disk].device) { config->raid.channel = rdp->disks[disk].device->channel->unit; @@ -1310,6 +1310,7 @@ config->raid.generation = rdp->generation; if (rdp->flags & AR_F_READY) { + config->raid.flags = (PR_F_VALID | PR_F_ASSIGNED | PR_F_ONLINE); config->raid.status = (PR_S_VALID | PR_S_ONLINE | PR_S_INITED | PR_S_READY); if (rdp->flags & AR_F_DEGRADED) @@ -1317,8 +1318,10 @@ else config->raid.status |= PR_S_FUNCTIONAL; } - else + else { + config->raid.flags = PR_F_DOWN; config->raid.status = 0; + } switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { case AR_F_RAID0: ==== //depot/projects/ia64/sys/dev/digi/digi.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi.c,v 1.25 2002/04/10 03:13:28 brian Exp $ + * $FreeBSD: src/sys/dev/digi/digi.c,v 1.27 2002/04/10 14:32:55 brian Exp $ */ /*- @@ -221,13 +221,13 @@ return (1); } -static void -digi_delay(struct digi_softc *sc, const char *txt) +void +digi_delay(struct digi_softc *sc, const char *txt, u_long timo) { if (cold) - DELAY(5000); + DELAY(timo * 1000000 / hz); else - tsleep(sc, PUSER | PCATCH, txt, 5); + tsleep(sc, PUSER | PCATCH, txt, timo); } static int @@ -314,12 +314,12 @@ for (i = 0; ((sc->pcibus ? PCIPORT : inb(sc->port)) & FEPMASK) != FEPRST; i++) { - if (i > 1000) { + if (i > 100) { log(LOG_ERR, "digi%d: %s init reset failed\n", sc->res.unit, sc->name); return (EIO); } - digi_delay(sc, "digiinit0"); + digi_delay(sc, "digiinit0", 5); } DLOG(DIGIDB_INIT, (sc->dev, "Got init reset after %d us\n", i)); @@ -370,24 +370,24 @@ for (i = 0; ((sc->pcibus ? PCIPORT : inb(sc->port)) & FEPMASK) == resp; i++) { - if (i > 1000) { + if (i > 100) { log(LOG_ERR, "digi%d: BIOS start failed\n", sc->res.unit); return (EIO); } - digi_delay(sc, "digibios0"); + digi_delay(sc, "digibios0", 5); } DLOG(DIGIDB_INIT, (sc->dev, "BIOS started after %d us\n", i)); for (i = 0; vW(ptr) != *(u_short *)"GD"; i++) { - if (i > 2000) { + if (i > 200) { log(LOG_ERR, "digi%d: BIOS boot failed " "(0x%02x != 0x%02x)\n", sc->res.unit, vW(ptr), *(u_short *)"GD"); return (EIO); } - digi_delay(sc, "digibios1"); + digi_delay(sc, "digibios1", 5); } DLOG(DIGIDB_INIT, (sc->dev, "BIOS booted after %d iterations\n", i)); @@ -421,13 +421,13 @@ outb(sc->port, FEPCLR | FEPMEM); for (i = 0; W(ptr); i++) { - if (i > 10) { + if (i > 100) { log(LOG_ERR, "digi%d: FEP/OS move failed\n", sc->res.unit); sc->hidewin(sc); return (EIO); } - digi_delay(sc, "digifep0"); + digi_delay(sc, "digifep0", 5); } DLOG(DIGIDB_INIT, (sc->dev, "FEP/OS moved after %d iterations\n", i)); @@ -506,14 +506,14 @@ /* Now wait 'till the FEP/OS has booted */ for (i = 0; vW(ptr) != *(u_short *)"OS"; i++) { - if (i > 2000) { + if (i > 200) { log(LOG_ERR, "digi%d: FEP/OS start failed " "(0x%02x != 0x%02x)\n", sc->res.unit, vW(ptr), *(u_short *)"OS"); sc->hidewin(sc); return (EIO); } - digi_delay(sc, "digifep1"); + digi_delay(sc, "digifep1", 5); } DLOG(DIGIDB_INIT, (sc->dev, "FEP/OS started after %d iterations\n", i)); ==== //depot/projects/ia64/sys/dev/digi/digi.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi.h,v 1.10 2002/02/27 23:47:45 peter Exp $ + * $FreeBSD: src/sys/dev/digi/digi.h,v 1.12 2002/04/10 14:32:55 brian Exp $ */ #define W(p) (*(u_int16_t *)(p)) @@ -215,3 +215,5 @@ int digi_attach(struct digi_softc *); int digi_detach(device_t _dev); int digi_shutdown(device_t _dev); +void digi_delay(struct digi_softc *_sc, const char *_txt, + u_long _timo); ==== //depot/projects/ia64/sys/dev/digi/digi_isa.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi_isa.c,v 1.7 2002/02/27 23:47:45 peter Exp $ + * $FreeBSD: src/sys/dev/digi/digi_isa.c,v 1.9 2002/04/10 14:32:55 brian Exp $ */ /*- @@ -112,12 +112,14 @@ /* Invasive probe - reset the card */ outb(sc->port, FEPRST); - for (i = 1000; DELAY(1), i >= 0; i--) + for (i = 0; i < 10; i++) { if ((inb(sc->port) & FEPMASK) == FEPRST) break; - if (i == -1) + digi_delay(sc, "digirst", 1); + } + if (i == 10) return (NULL); - DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d us\n", 1000 - i)); + DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d delays\n", i)); ident = inb(sc->port); @@ -373,18 +375,17 @@ reset |= FEPMEM; outb(sc->port, reset); - for (i = 10; DELAY(1), i >= 0; i--) { + for (i = 0; i < 10; i++) { if ((inb(sc->port) & FEPMASK) == reset) break; - tsleep(sc, PUSER | PCATCH, "digirst0", hz / 5); + digi_delay(sc, "digirst1", 1); } - if (i == -1) { + if (i == 10) { device_printf(dev, "1st reset failed\n"); sc->hidewin(sc); goto failed; } - DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d us\n", - (10 - i) * (hz / 5))); + DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d delays\n", i)); if (sc->model != PCXI) { t = (sc->pmem >> 8) & 0xffe0; @@ -396,17 +397,18 @@ if (sc->model == PCXI || sc->model == PCXE) { outb(sc->port, FEPRST | FEPMEM); - for (i = 10000; DELAY(1), i >= 0; i--) + for (i = 0; i < 10; i++) { if ((inb(sc->port) & FEPMASK) != FEPRST) break; - if (i == -1) { + digi_delay(sc, "digirst2", 1); + } + if (i == 10) { device_printf(dev, "2nd reset failed (0x%02x)\n", inb(sc->port)); sc->hidewin(sc); goto failed; } - DLOG(DIGIDB_INIT, (sc->dev, "got memory after %d us\n", - 10000 - i)); + DLOG(DIGIDB_INIT, (sc->dev, "got memory after %d delays\n", i)); } DLOG(DIGIDB_INIT, (sc->dev, "short memory test\n")); ==== //depot/projects/ia64/sys/dev/usb/umass.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.57 2002/04/01 21:13:21 joe Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.58 2002/04/10 13:22:12 n_hibma Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -394,25 +394,26 @@ int transfer_status; int transfer_state; -# define TSTATE_IDLE 0 -# define TSTATE_BBB_COMMAND 1 /* CBW transfer */ -# define TSTATE_BBB_DATA 2 /* Data transfer */ -# define TSTATE_BBB_DCLEAR 3 /* clear endpt stall */ -# define TSTATE_BBB_STATUS1 4 /* clear endpt stall */ -# define TSTATE_BBB_SCLEAR 5 /* clear endpt stall */ -# define TSTATE_BBB_STATUS2 6 /* CSW transfer */ -# define TSTATE_BBB_RESET1 7 /* reset command */ -# define TSTATE_BBB_RESET2 8 /* in clear stall */ -# define TSTATE_BBB_RESET3 9 /* out clear stall */ -# define TSTATE_CBI_COMMAND 10 /* command transfer */ -# define TSTATE_CBI_DATA 11 /* data transfer */ -# define TSTATE_CBI_STATUS 12 /* status transfer */ -# define TSTATE_CBI_DCLEAR 13 /* clear ep stall */ -# define TSTATE_CBI_SCLEAR 14 /* clear ep stall */ -# define TSTATE_CBI_RESET1 15 /* reset command */ -# define TSTATE_CBI_RESET2 16 /* in clear stall */ -# define TSTATE_CBI_RESET3 17 /* out clear stall */ -# define TSTATE_STATES 18 /* # of states above */ +# define TSTATE_ATTACH 0 /* in attach */ +# define TSTATE_IDLE 1 +# define TSTATE_BBB_COMMAND 2 /* CBW transfer */ +# define TSTATE_BBB_DATA 3 /* Data transfer */ +# define TSTATE_BBB_DCLEAR 4 /* clear endpt stall */ +# define TSTATE_BBB_STATUS1 5 /* clear endpt stall */ +# define TSTATE_BBB_SCLEAR 6 /* clear endpt stall */ +# define TSTATE_BBB_STATUS2 7 /* CSW transfer */ +# define TSTATE_BBB_RESET1 8 /* reset command */ +# define TSTATE_BBB_RESET2 9 /* in clear stall */ +# define TSTATE_BBB_RESET3 10 /* out clear stall */ +# define TSTATE_CBI_COMMAND 11 /* command transfer */ +# define TSTATE_CBI_DATA 12 /* data transfer */ +# define TSTATE_CBI_STATUS 13 /* status transfer */ +# define TSTATE_CBI_DCLEAR 14 /* clear ep stall */ +# define TSTATE_CBI_SCLEAR 15 /* clear ep stall */ +# define TSTATE_CBI_RESET1 16 /* reset command */ +# define TSTATE_CBI_RESET2 17 /* in clear stall */ +# define TSTATE_CBI_RESET3 18 /* out clear stall */ +# define TSTATE_STATES 19 /* # of states above */ /* SCSI/CAM specific variables */ @@ -428,6 +429,7 @@ #ifdef UMASS_DEBUG char *states[TSTATE_STATES+1] = { /* should be kept in sync with the list at transfer_state */ + "Attach", "Idle", "BBB CBW", "BBB Data", @@ -932,7 +934,7 @@ } /* initialisation of generic part */ - sc->transfer_state = TSTATE_IDLE; + sc->transfer_state = TSTATE_ATTACH; /* request a sufficient number of xfer handles */ for (i = 0; i < XFER_NR; i++) { @@ -1015,7 +1017,7 @@ __FILE__, __LINE__, sc->proto); } - + sc->transfer_state = TSTATE_IDLE; DPRINTF(UDMASS_GEN, ("%s: Attach finished\n", USBDEVNAME(sc->sc_dev))); USB_ATTACH_SUCCESS_RETURN; ==== //depot/projects/ia64/sys/i386/include/ansi.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/i386/include/ansi.h,v 1.36 2002/03/24 11:25:45 obrien Exp $ + * $FreeBSD: src/sys/i386/include/ansi.h,v 1.37 2002/04/10 15:58:11 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -52,6 +52,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ +#define _BSD_SEGSZ_T_ __int32_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t /* socklen_t (duh) */ #define _BSD_SSIZE_T_ int /* byte count or error */ ==== //depot/projects/ia64/sys/i386/include/endian.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)endian.h 7.8 (Berkeley) 4/3/91 - * $FreeBSD: src/sys/i386/include/endian.h,v 1.32 2002/03/09 21:02:12 mike Exp $ + * $FreeBSD: src/sys/i386/include/endian.h,v 1.33 2002/04/10 14:39:13 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -46,17 +46,26 @@ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ +#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ +#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ +#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ + +#define _BYTE_ORDER _LITTLE_ENDIAN -#define BYTE_ORDER LITTLE_ENDIAN -#endif /* ! _POSIX_SOURCE */ +/* + * Deprecated variants that don't have enough underscores to be useful in more + * strict namespaces. + */ +#if __BSD_VISIBLE +#define LITTLE_ENDIAN _LITTLE_ENDIAN +#define BIG_ENDIAN _BIG_ENDIAN +#define PDP_ENDIAN _PDP_ENDIAN +#define BYTE_ORDER _BYTE_ORDER +#endif #ifdef __GNUC__ ==== //depot/projects/ia64/sys/ia64/ia64/exception.s#11 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/exception.s,v 1.32 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/ia64/ia64/exception.s,v 1.33 2002/04/10 16:35:44 dfr Exp $ */ #include <machine/asm.h> ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#14 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.54 2002/04/04 21:03:25 jhb Exp $ + * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.55 2002/04/10 16:34:52 dfr Exp $ */ /* @@ -445,6 +445,7 @@ kernel_pmap->pm_count = 1; kernel_pmap->pm_active = 1; TAILQ_INIT(&kernel_pmap->pm_pvlist); + PCPU_SET(current_pmap, kernel_pmap); /* * Region 5 is mapped via the vhpt. ==== //depot/projects/ia64/sys/ia64/include/ansi.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/ia64/include/ansi.h,v 1.19 2002/03/26 02:59:00 obrien Exp $ + * $FreeBSD: src/sys/ia64/include/ansi.h,v 1.20 2002/04/10 15:58:12 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -53,6 +53,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ +#define _BSD_SEGSZ_T_ __int32_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned long /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t #define _BSD_SSIZE_T_ long /* byte count or error */ ==== //depot/projects/ia64/sys/ia64/include/endian.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/ia64/include/endian.h,v 1.8 2002/03/09 21:02:14 mike Exp $ + * $FreeBSD: src/sys/ia64/include/endian.h,v 1.9 2002/04/10 14:39:13 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -47,17 +47,26 @@ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ +#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ +#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ +#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ + +#define _BYTE_ORDER _LITTLE_ENDIAN -#define BYTE_ORDER LITTLE_ENDIAN -#endif /* !_POSIX_SOURCE */ +/* + * Deprecated variants that don't have enough underscores to be useful in more + * strict namespaces. + */ +#if __BSD_VISIBLE +#define LITTLE_ENDIAN _LITTLE_ENDIAN +#define BIG_ENDIAN _BIG_ENDIAN +#define PDP_ENDIAN _PDP_ENDIAN +#define BYTE_ORDER _BYTE_ORDER +#endif #ifdef __GNUC__ ==== //depot/projects/ia64/sys/netinet/in.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.64 2002/04/09 18:01:26 silby Exp $ + * $FreeBSD: src/sys/netinet/in.h,v 1.65 2002/04/10 11:59:02 mike Exp $ */ #ifndef _NETINET_IN_H_ @@ -324,9 +324,7 @@ char sin_zero[8]; }; -#ifndef INET_ADDRSTRLEN #define INET_ADDRSTRLEN 16 -#endif /* * Options for use with [gs]etsockopt at the IP level. ==== //depot/projects/ia64/sys/netinet6/in6.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6.h,v 1.17 2002/03/19 15:01:21 darrenr Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6.h,v 1.18 2002/04/10 11:59:02 mike Exp $ */ /* $KAME: in6.h,v 1.89 2001/05/27 13:28:35 itojun Exp $ */ /* @@ -132,9 +132,7 @@ #define s6_addr32 __u6_addr.__u6_addr32 #endif -#ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 -#endif /* * Socket address for IPv6 ==== //depot/projects/ia64/sys/powerpc/include/ansi.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/powerpc/include/ansi.h,v 1.19 2002/03/24 11:25:46 obrien Exp $ + * $FreeBSD: src/sys/powerpc/include/ansi.h,v 1.20 2002/04/10 15:58:12 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -52,6 +52,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ +#define _BSD_SEGSZ_T_ __int32_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t /* socklen_t (duh) */ #define _BSD_SSIZE_T_ long /* byte count or error */ ==== //depot/projects/ia64/sys/powerpc/include/endian.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/powerpc/include/endian.h,v 1.7 2002/03/09 21:02:15 mike Exp $ + * $FreeBSD: src/sys/powerpc/include/endian.h,v 1.8 2002/04/10 14:39:13 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -50,13 +50,22 @@ * Definitions for byte order, according to byte significance from low * address to high. */ -#ifndef _POSIX_SOURCE -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ +#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ +#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ +#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ + +#define _BYTE_ORDER _BIG_ENDIAN -#define BYTE_ORDER BIG_ENDIAN -#endif /* !_POSIX_SOURCE */ +/* + * Deprecated variants that don't have enough underscores to be useful in more + * strict namespaces. + */ +#if __BSD_VISIBLE +#define LITTLE_ENDIAN _LITTLE_ENDIAN +#define BIG_ENDIAN _BIG_ENDIAN +#define PDP_ENDIAN _PDP_ENDIAN +#define BYTE_ORDER _BYTE_ORDER +#endif #ifdef __GNUC__ ==== //depot/projects/ia64/sys/sparc64/include/ansi.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/sparc64/include/ansi.h,v 1.13 2002/03/24 11:25:46 obrien Exp $ + * $FreeBSD: src/sys/sparc64/include/ansi.h,v 1.14 2002/04/10 15:58:12 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -53,6 +53,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ +#define _BSD_SEGSZ_T_ __int64_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned long /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t /* socklen_t (duh) */ #define _BSD_SSIZE_T_ long /* byte count or error */ ==== //depot/projects/ia64/sys/sparc64/include/endian.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)endian.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/sparc64/include/endian.h,v 1.7 2002/03/09 21:02:15 mike Exp $ + * $FreeBSD: src/sys/sparc64/include/endian.h,v 1.8 2002/04/10 14:39:14 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -45,17 +45,26 @@ #define _QUAD_HIGHWORD 0 #define _QUAD_LOWWORD 1 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204101915.g3AJFMU67599>