Date: Sat, 14 Dec 1996 23:00:59 +0100 (MET) From: J Wunsch <j@uriah.heep.sax.de> To: profroot@iq.org (I call god) Cc: current@freebsd.org Subject: Re: num_eisa_slots Message-ID: <199612142201.XAA29926@uriah.heep.sax.de> In-Reply-To: <199612141321.AAA14515@profane.iq.org> from I call god at "Dec 15, 96 00:21:15 am"
next in thread | previous in thread | raw e-mail | index | archive | help
As I call god wrote:
> loading kernel
> userconfig.o: Undefined symbol `_num_eisa_slots' referenced from text segment
> userconfig.o: Undefined symbol `_num_eisa_slots' referenced from text segment
> userconfig.o: Undefined symbol `_num_eisa_slots' referenced from text segment
> *** Error code 1
Here's my official fix, give it a try please.
cvs diff: Diffing .
Index: userconfig.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/i386/userconfig.c,v
retrieving revision 1.72
diff -u -r1.72 userconfig.c
--- userconfig.c 1996/12/14 18:07:17 1.72
+++ userconfig.c 1996/12/14 22:00:22
@@ -2272,7 +2272,6 @@
static int set_device_flags(CmdParm *);
static int set_device_enable(CmdParm *);
static int set_device_disable(CmdParm *);
-static int set_num_eisa_slots(CmdParm *);
static int quitfunc(CmdParm *);
static int helpfunc(CmdParm *);
#if defined(USERCONFIG_BOOT)
@@ -2282,7 +2281,11 @@
static int lineno;
/* XXX hack */
+#incldue "eisa.h"
+#if NEISA > 0
extern int num_eisa_slots;
+static int set_num_eisa_slots(CmdParm *);
+#endif /* NEISA > 0 */
static CmdParm addr_parms[] = {
{ PARM_DEVSPEC, {} },
@@ -2301,16 +2304,20 @@
{ -1, {} },
};
+#if NEISA > 0
static CmdParm int_arg[] = {
{ PARM_INT, {} },
{ -1, {} },
};
+#endif /* NEISA > 0 */
static Cmd CmdList[] = {
{ "?", helpfunc, NULL }, /* ? (help) */
{ "di", set_device_disable, dev_parms }, /* disable dev */
{ "dr", set_device_drq, int_parms }, /* drq dev # */
+#if NEISA > 0
{ "ei", set_num_eisa_slots, int_arg }, /* # EISA slots */
+#endif /* NEISA > 0 */
{ "en", set_device_enable, dev_parms }, /* enable dev */
{ "ex", quitfunc, NULL }, /* exit (quit) */
{ "f", set_device_flags, int_parms }, /* flags dev mask */
@@ -2461,7 +2468,9 @@
if (lsdevtab(&isa_devtab_tty[0])) return 0;
if (lsdevtab(&isa_devtab_net[0])) return 0;
if (lsdevtab(&isa_devtab_null[0])) return 0;
+#if NEISA > 0
printf("\nNumber of EISA slots to probe: %d\n", num_eisa_slots);
+#endif /* NEISA > 0 */
return 0;
}
@@ -2547,6 +2556,7 @@
return 0;
}
+#if NEISA > 0
static int
set_num_eisa_slots(CmdParm *parms)
{
@@ -2556,6 +2566,7 @@
num_eisa_slots = (num_slots <= 16 ? num_slots : 10);
return 0;
}
+#endif /* NEISA > 0 */
static int
quitfunc(CmdParm *parms)
@@ -2577,7 +2588,9 @@
printf("flags <devname> <mask>\tSet device flags\n");
printf("enable <devname>\tEnable device\n");
printf("disable <devname>\tDisable device (will not be probed)\n");
+#if NEISA > 0
printf("eisa <number>\t\tSet the number of EISA slots to probe\n");
+#endif /* NEISA > 0 */
printf("quit\t\t\tExit this configuration utility\n");
printf("reset\t\t\tReset CPU\n");
#ifdef VISUAL_USERCONFIG
--
cheers, J"org
joerg_wunsch@uriah.heep.sax.de -- http://www.sax.de/~joerg/ -- NIC: JW11-RIPE
Never trust an operating system you don't have sources for. ;-)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199612142201.XAA29926>