From: maja Date: Fri, 6 Sep 1996 08:53:43 +0000 (+0000) Subject: Added support for add device in subr_userconf. Not perfect but a good start. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=bb177d8c5fe344046ba7dad48e2a272217be4c97;p=openbsd Added support for add device in subr_userconf. Not perfect but a good start. This needed changes in config, so if your kernel uses BOOT_CONFIG you need to rebuild config before a new kernel can be built. -moj --- diff --git a/sys/kern/subr_userconf.c b/sys/kern/subr_userconf.c index 3bbdb4affeb..5fa4618bb1b 100644 --- a/sys/kern/subr_userconf.c +++ b/sys/kern/subr_userconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_userconf.c,v 1.7 1996/09/02 02:46:39 deraadt Exp $ */ +/* $OpenBSD: subr_userconf.c,v 1.8 1996/09/06 08:53:43 maja Exp $ */ /* * Copyright (c) 1996 Mats O Jansson @@ -42,15 +42,19 @@ extern char *locnames[]; extern short locnamp[]; extern struct cfdata cfdata[]; -extern cfroots[]; - -int userconf_base = 16; -int userconf_maxdev = -1; -int userconf_maxlocnames = -1; -int userconf_cnt = -1; -int userconf_lines = 12; -char userconf_argbuf[40]; -char userconf_cmdbuf[40]; +extern short cfroots[]; +extern int cfroots_size; +extern int pv_size; +extern short pv[]; + +int userconf_base = 16; /* Base for "large" numbers */ +int userconf_maxdev = -1; /* # of used device slots */ +int userconf_totdev = -1; /* # of device slots */ +int userconf_maxlocnames = -1; /* # of locnames */ +int userconf_cnt = -1; /* Line counter for ... */ +int userconf_lines = 12; /* ... # of lines per page */ +char userconf_argbuf[40]; /* Additional input */ +char userconf_cmdbuf[40]; /* Command line */ void userconf_init __P((void)); int userconf_more __P((void)); @@ -70,6 +74,8 @@ void userconf_show __P((void)); void userconf_show_attr_val __P((short, int *)); void userconf_show_attr __P((char *)); void userconf_common_dev __P((char *, int, short, short, char)); +void userconf_add_read __P((char *, char, char *, int, int *)); +void userconf_add __P((char *, int, short, short)); int userconf_parse __P((char *)); #define UC_CHANGE 'c' @@ -78,7 +84,7 @@ int userconf_parse __P((char *)); #define UC_FIND 'f' char *userconf_cmds[] = { -/* "add", "a", */ + "add", "a", "base", "b", "change", "c", "disable", "d", @@ -104,6 +110,7 @@ userconf_init() while(cfdata[i].cf_attach != 0) { userconf_maxdev = i; + userconf_totdev = i; cd = &cfdata[i]; ln=cd->cf_locnames; @@ -115,6 +122,13 @@ userconf_init() } i++; } + + while(cfdata[i].cf_attach == 0) { + userconf_totdev = i; + i++; + } + + userconf_totdev = userconf_totdev - 1; } int @@ -201,6 +215,8 @@ userconf_pdev(devno) cd = &cfdata[devno]; + printf("%3d ",devno); +/* printf("%3d",devno); switch(cd->cf_fstate) { case FSTATE_NOTFOUND: @@ -216,7 +232,7 @@ userconf_pdev(devno) printf(" ? "); break; } - +*/ userconf_pdevnam(devno); printf(" at"); c=' '; @@ -227,6 +243,19 @@ userconf_pdev(devno) userconf_pdevnam(*p++); c='|'; }; + switch(cd->cf_fstate) { + case FSTATE_NOTFOUND: + case FSTATE_FOUND: + case FSTATE_STAR: + break; + case FSTATE_DNOTFOUND: + case FSTATE_DSTAR: + printf(" disable"); + break; + default: + printf(" ???"); + break; + } l=cd->cf_loc; ln=cd->cf_locnames; while (locnamp[ln] != -1) { @@ -505,6 +534,9 @@ userconf_help() case 'L': printf("[count] number of lines before more"); break; + case 'a': + printf("dev add a device"); + break; case 'b': printf("8|10|16 base on large numbers"); break; @@ -725,6 +757,180 @@ userconf_common_dev(dev, len, unit, state, routine) } +userconf_add_read(prompt,field,dev,len,val) + char *prompt; + char field; + char *dev; + int len; + int *val; +{ + int ok = 0; + int a; + char *c; + int i; + + *val = -1; + + while(!ok) { + printf("%s ? ",prompt); + + i = getsn(userconf_argbuf,sizeof(userconf_argbuf)); + + c = userconf_argbuf; + while (*c == ' ' || *c == '\t' || *c == '\n') c++; + + if (*c != '\000') { + if (userconf_number(c,&a) == 0) { + if (a > userconf_maxdev) { + printf("Unknown devno (max is %d)\n", + userconf_maxdev); + } else if (strncasecmp(dev, + cfdata[a].cf_driver->cd_name, + len) != 0) { + printf("Not same device type\n"); + } else { + *val = a; + ok = 1; + } + } else if (*c == '?') { + userconf_common_dev(dev,len,0, + FSTATE_FOUND,UC_FIND); + } else if (*c == 'q' || *c == 'Q') { + ok = 1; + } else { + printf("Unknown argument\n"); + } + } else { + ok = 1; + } + } +} + +userconf_add(dev,len,unit,state) + char *dev; + int len; + short unit, state; +{ + int i = 0, found = 0; + struct cfdata new = {0}; + char cmd; + int val, max_unit; + + if (userconf_maxdev == userconf_totdev) { + printf("No more space for new devices.\n"); + return; + } + + if (state == FSTATE_FOUND) { + printf("Device not complete number or * is missing/n"); + return; + } + + for (i = 0; cfdata[i].cf_driver; i++) + if (strlen(cfdata[i].cf_driver->cd_name) == len && + strncasecmp(dev,cfdata[i].cf_driver->cd_name,len) == 0) + found = 1; + + if (!found) { + printf("No device of this type exists.\n"); + return; + } + + userconf_add_read("Clone Device (DevNo, 'q' or '?')", + 'a',dev,len,&val); + + if (val != -1) { + + new = cfdata[val]; + new.cf_unit = unit; + new.cf_fstate = state; + + userconf_add_read("Insert before Device (DevNo, 'q' or '?')", + 'i',dev,len,&val); + + } + + if (val != -1) { + + /* Insert the new record */ + + for (i = userconf_maxdev; val <= i; i--) { + cfdata[i+1] = cfdata[i]; + } + cfdata[val] = new; + + /* Fix indexs in pv */ + + for (i = 0; i < pv_size; i++) { + if ((pv[i] != -1) && (pv[i] >= val)) { + pv[i] = pv[i]++; + } + } + + /* Fix indexs in cfroots */ + + for (i = 0; i < cfroots_size; i++) { + if ((cfroots[i] != -1) && (cfroots[i] >= val)) { + cfroots[i] = cfroots[i]++; + } + } + + userconf_maxdev++; + + max_unit = -1; + + /* Find max unit number of the device type */ + + i = 0; + while(cfdata[i].cf_attach != 0) { + if (strlen(cfdata[i].cf_driver->cd_name) == len && + strncasecmp(dev, + cfdata[i].cf_driver->cd_name, + len) == 0) { + switch (cfdata[i].cf_fstate) { + case FSTATE_NOTFOUND: + case FSTATE_DNOTFOUND: + if (cfdata[i].cf_unit > max_unit) + max_unit = cfdata[i].cf_unit; + break; + default: + break; + } + } + i++; + } + + /* For all * entries set unit number to max+1 */ + + max_unit++; + + i = 0; + while(cfdata[i].cf_attach != 0) { + if (strlen(cfdata[i].cf_driver->cd_name) == len && + strncasecmp(dev, + cfdata[i].cf_driver->cd_name, + len) == 0) { + switch (cfdata[i].cf_fstate) { + case FSTATE_STAR: + case FSTATE_DSTAR: + cfdata[i].cf_unit = max_unit; + break; + default: + break; + } + } + i++; + } + + userconf_pdev(val); + + } + + /* cf_attach, cf_driver, cf_unit, cf_state, cf_loc, cf_flags, + cf_parents, cf_locnames, cf_locnames and cf_ivstubs */ + +} + int userconf_parse(cmd) char *cmd; @@ -769,6 +975,15 @@ userconf_parse(cmd) printf("Unknown argument\n"); } break; + case 'a': + if (*c == '\000') { + printf("Dev expected\n"); + } else if (userconf_device(c,&a,&unit,&state) == 0) { + userconf_add(c,a,unit,state); + } else { + printf("Unknown argument\n"); + } + break; case 'b': if (*c == '\000') { printf("8|10|16 expected\n"); diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c index b3d7626f71f..64a2ced7ba9 100644 --- a/usr.sbin/config/mkioconf.c +++ b/usr.sbin/config/mkioconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkioconf.c,v 1.5 1996/07/07 22:02:20 maja Exp $ */ +/* $OpenBSD: mkioconf.c,v 1.6 1996/09/06 08:53:44 maja Exp $ */ /* $NetBSD: mkioconf.c,v 1.38 1996/03/17 06:29:27 cgd Exp $ */ /* @@ -331,8 +331,11 @@ emitpv(fp) { register int i; + if (fprintf(fp, "\n/* size of parent vectors */\n\ +int pv_size = %d;\n", parents.used) < 0) + return (1); if (fprintf(fp, "\n/* parent vectors */\n\ -static short pv[%d] = {", parents.used) < 0) +short pv[%d] = {", parents.used) < 0) return (1); for (i = 0; i < parents.used; i++) if (fprintf(fp, "%s%d,", SEP(i, 16), parents.vec[i]) < 0) @@ -422,7 +425,11 @@ struct cfdata cfdata[] = {\n\ vs, v) < 0) return (1); } - return (fputs(" {0}\n};\n", fp) < 0); + if (fprintf(fp, " {0},\n {0},\n {0},\n {0},\n") < 0) + return (1); + if (fprintf(fp, " {0},\n {0},\n {0},\n {0},\n") < 0) + return (1); + return (fputs(" {(struct cfattach *)-1}\n};\n", fp) < 0); } /* @@ -433,6 +440,7 @@ emitroots(fp) register FILE *fp; { register struct devi **p, *i; + int cnt = 0; if (fputs("\nshort cfroots[] = {\n", fp) < 0) return (1); @@ -447,8 +455,12 @@ emitroots(fp) if (fprintf(fp, "\t%2d /* %s */,\n", i->i_cfindex, i->i_name) < 0) return (1); + cnt++; } - return (fputs("\t-1\n};\n", fp) < 0); + if (fputs("\t-1\n};\n", fp) < 0) + return (1); + + return(fprintf(fp, "\nint cfroots_size = %d;\n", cnt+1) < 0); } /*