From owner-p4-releng Sun Mar 31 4:10:14 2002 Delivered-To: p4-releng@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C007437B41C; Sun, 31 Mar 2002 04:09:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B2B8937B41A for ; Sun, 31 Mar 2002 04:09:48 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2VC9mC72677 for perforce@freebsd.org; Sun, 31 Mar 2002 04:09:48 -0800 (PST) (envelope-from murray@freebsd.org) Date: Sun, 31 Mar 2002 04:09:48 -0800 (PST) Message-Id: <200203311209.g2VC9mC72677@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to murray@freebsd.org using -f From: Murray Stokely Subject: PERFORCE change 8724 for review To: Perforce Change Reviews Sender: owner-p4-releng@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8724 Change 8724 by murray@murray_builder on 2002/03/31 04:09:47 Integrate PCCARD removal for the Alpha platform. Affected files ... ... //depot/releng/5_dp1/src/usr.sbin/sysinstall/Makefile#2 integrate ... //depot/releng/5_dp1/src/usr.sbin/sysinstall/main.c#2 integrate ... //depot/releng/5_dp1/src/usr.sbin/sysinstall/menus.c#3 integrate ... //depot/releng/5_dp1/src/usr.sbin/sysinstall/sysinstall.h#2 integrate ... //depot/releng/5_dp1/src/usr.sbin/sysinstall/tcpip.c#2 integrate Differences ... ==== //depot/releng/5_dp1/src/usr.sbin/sysinstall/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.121 2002/03/15 11:27:47 ru Exp $ +# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.124 2002/03/29 23:03:17 murray Exp $ PROG= sysinstall MAN= sysinstall.8 @@ -6,10 +6,14 @@ disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \ ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \ label.c main.c makedevs.c media.c menus.c misc.c modules.c \ - mouse.c msg.c network.c nfs.c options.c package.c pccard.c \ + mouse.c msg.c network.c nfs.c options.c package.c \ system.c tape.c tcpip.c termcap.c ttys.c ufs.c usb.c user.c \ variable.c wizard.c keymap.h +.if ${MACHINE_ARCH} == "i386" +SRCS+= pccard.c +.endif + CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I. .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 @@ -18,7 +22,7 @@ DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO} LDADD= -ldialog -lncurses -lutil -ldisk -lftpio -CLEANFILES= makedevs.c rtermcap rtermcap.tmp dumpnlist +CLEANFILES= makedevs.c rtermcap CLEANFILES+= keymap.tmp keymap.h makedevs.c: Makefile rtermcap ==== //depot/releng/5_dp1/src/usr.sbin/sysinstall/main.c#2 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/main.c,v 1.66 2001/10/12 07:36:34 jkh Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/main.c,v 1.67 2002/03/29 23:03:17 murray Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -111,10 +111,12 @@ } /* Initialize PC-card, if we haven't already done so. */ +#ifdef PCCARD_ARCH if (!pvariable_get("pccardInitialize")) { pccardInitialize(); pvariable_set("pccardInitialize=1"); } +#endif /* Initialize USB, if we haven't already done so. */ if (!pvariable_get("usbInitialize")) { ==== //depot/releng/5_dp1/src/usr.sbin/sysinstall/menus.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.337 2002/01/30 01:34:16 jkh Exp $"; + "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.339 2002/03/29 23:03:17 murray Exp $"; #endif #include "sysinstall.h" @@ -1292,12 +1292,14 @@ checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { " APM", "Auto-power management services (typically laptops)", dmenuVarCheck, dmenuToggleVariable, NULL, "apm_enable=YES" }, +#ifdef PCCARD_ARCH { " pccard", "Enable PCCARD (AKA PCMCIA) services (also laptops)", dmenuVarCheck, dmenuToggleVariable, NULL, "pccard_enable=YES" }, { " pccard mem", "Set PCCARD memory address (if enabled)", dmenuVarCheck, dmenuISetVariable, NULL, "pccard_mem" }, { " pccard ifconfig", "List of PCCARD ethernet devices to configure", dmenuVarCheck, dmenuISetVariable, NULL, "pccard_ifconfig" }, +#endif { " usbd", "Enable USB daemon (detect USB attach / detach)", dmenuVarCheck, dmenuToggleVariable, NULL, "usbd_enable=YES" }, { " usbd flags", "Set default flags to usbd (if enabled)", ==== //depot/releng/5_dp1/src/usr.sbin/sysinstall/sysinstall.h#2 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/sysinstall.h,v 1.222 2001/12/21 18:30:50 rwatson Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/sysinstall.h,v 1.223 2002/03/29 23:03:17 murray Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -54,6 +54,9 @@ /*** Defines ***/ +#if defined(__i386__) || defined(PC98) +#define PCCARD_ARCH 1 /* Support PCCARD installations */ +#endif /* device limits */ #define DEV_NAME_MAX 64 /* The maximum length of a device name */ #define DEV_MAX 100 /* The maximum number of devices we'll deal with */ ==== //depot/releng/5_dp1/src/usr.sbin/sysinstall/tcpip.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/usr.sbin/sysinstall/tcpip.c,v 1.122 2001/12/10 10:34:47 murray Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/tcpip.c,v 1.123 2002/03/29 23:03:17 murray Exp $ * * Copyright (c) 1995 * Gary J Palmer. All rights reserved. @@ -575,10 +575,12 @@ ipaddr, extras, netmask); variable_set2(ifn, temp, 1); } +#ifdef PCCARD_ARCH pccard = variable_get("_pccard_install"); if (pccard && strcmp(pccard, "YES") == 0 && ipv4_enable) { variable_set2("pccard_ifconfig", temp, 1); } +#endif if (use_rtsol) variable_set2(VAR_IPV6_ENABLE, "YES", 1); if (!use_dhcp) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-releng" in the body of the message