Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split plain/interface/devclass attribute initializers.

This commit is contained in:
uebayasi 2014-10-10 06:13:30 +00:00
parent b4d3dfc64a
commit bd3d511493
3 changed files with 84 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/config/gram.y
View File

@ -1,5 +1,5 @@
%{
/* $NetBSD: gram.y,v 1.41 2014/10/09 09:39:24 uebayasi Exp $ */
/* $NetBSD: gram.y,v 1.42 2014/10/10 06:13:30 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@ -356,7 +356,7 @@ define_prefix:
;
define_devclass:
DEVCLASS WORD { (void)defattr($2, NULL, NULL, 1); }
DEVCLASS WORD { (void)defdevclass($2, NULL, NULL, 1); }
;
define_filesystems:
@ -365,7 +365,7 @@ define_filesystems:
define_attribute:
DEFINE WORD interface_opt depend_list
{ (void)defattr($2, $3, $4, 0); }
{ (void)defattr0($2, $3, $4, 0); }
;
define_option:

121
usr.bin/config/sem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sem.c,v 1.48 2014/10/10 05:27:28 uebayasi Exp $ */
/* $NetBSD: sem.c,v 1.49 2014/10/10 06:13:30 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@ -203,20 +203,25 @@ setident(const char *i)
* Since an empty locator list is logically different from "no interface",
* all locator lists include a dummy head node, which we discard here.
*/
int
defattr0(const char *name, struct loclist *locs, struct attrlist *deps,
int devclass)
{
if (locs != NULL)
return defiattr(name, locs, deps, devclass);
else if (devclass)
return defdevclass(name, locs, deps, devclass);
else
return defattr(name, locs, deps, devclass);
}
int
defattr(const char *name, struct loclist *locs, struct attrlist *deps,
int devclass)
{
struct attr *a, *dep;
struct attrlist *al;
struct loclist *ll;
int len;
if (locs != NULL && devclass)
panic("defattr(%s): locators and devclass", name);
if (deps != NULL && devclass)
panic("defattr(%s): dependencies and devclass", name);
/*
* If this attribute depends on any others, make sure none of
@ -243,45 +248,73 @@ defattr(const char *name, struct loclist *locs, struct attrlist *deps,
a->a_deps = deps;
a->a_expanding = 0;
TAILQ_INIT(&a->a_files);
/* "interface attribute" initialization */
if (locs != NULL) {
a->a_iattr = 1;
/* unwrap */
a->a_locs = locs->ll_next;
locs->ll_next = NULL;
loclist_destroy(locs);
len = 0;
for (ll = a->a_locs; ll != NULL; ll = ll->ll_next)
len++;
a->a_loclen = len;
}
/* "device class" initialization */
if (devclass) {
char classenum[256], *cp;
int errored = 0;
(void)snprintf(classenum, sizeof(classenum), "DV_%s", name);
for (cp = classenum + 3; *cp; cp++) {
if (!errored &&
(!isalnum((unsigned char)*cp) ||
(isalpha((unsigned char)*cp) && !islower((unsigned char)*cp)))) {
cfgerror("device class names must be "
"lower-case alphanumeric characters");
errored = 1;
}
*cp = toupper((unsigned char)*cp);
}
a->a_devclass = intern(classenum);
}
/* Expand the attribute to check for cycles in the graph. */
expandattr(a, NULL);
return (0);
}
/* "interface attribute" initialization */
int
defiattr(const char *name, struct loclist *locs, struct attrlist *deps,
int devclass)
{
struct attr *a;
int len;
struct loclist *ll;
if (devclass)
panic("defattr(%s): locators and devclass", name);
if (defattr(name, locs, deps, devclass) != 0)
return (1);
a = getattr(name);
a->a_iattr = 1;
/* unwrap */
a->a_locs = locs->ll_next;
locs->ll_next = NULL;
loclist_destroy(locs);
len = 0;
for (ll = a->a_locs; ll != NULL; ll = ll->ll_next)
len++;
a->a_loclen = len;
if (deps)
CFGDBG(2, "attr `%s' iface with deps", a->a_name);
return (0);
}
/* "device class" initialization */
int
defdevclass(const char *name, struct loclist *locs, struct attrlist *deps,
int devclass)
{
struct attr *a;
char classenum[256], *cp;
int errored = 0;
if (deps)
panic("defattr(%s): dependencies and devclass", name);
if (defattr(name, locs, deps, devclass) != 0)
return (1);
a = getattr(name);
(void)snprintf(classenum, sizeof(classenum), "DV_%s", name);
for (cp = classenum + 3; *cp; cp++) {
if (!errored &&
(!isalnum((unsigned char)*cp) ||
(isalpha((unsigned char)*cp) && !islower((unsigned char)*cp)))) {
cfgerror("device class names must be "
"lower-case alphanumeric characters");
errored = 1;
}
*cp = toupper((unsigned char)*cp);
}
a->a_devclass = intern(classenum);
return (0);
}
/*
* Return true if the given `error object' is embedded in the given
* pointer list.
@ -360,7 +393,7 @@ defdev(struct devbase *dev, struct loclist *loclist, struct attrlist *attrs,
if (loclist != NULL) {
ll = loclist;
loclist = NULL; /* defattr disposes of them for us */
if (defattr(dev->d_name, ll, NULL, 0))
if (defiattr(dev->d_name, ll, NULL, 0))
goto bad;
attrs = attrlist_cons(attrs, getattr(dev->d_name));
/* This used to be stored but was never used */

5
usr.bin/config/sem.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: sem.h,v 1.10 2012/03/11 21:16:08 dholland Exp $ */
/* $NetBSD: sem.h,v 1.11 2014/10/10 06:13:30 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@ -46,7 +46,10 @@ void setversion(int);
void setdefmaxusers(int, int, int);
void setmaxusers(int);
void setident(const char *);
int defattr0(const char *, struct loclist *, struct attrlist *, int);
int defattr(const char *, struct loclist *, struct attrlist *, int);
int defiattr(const char *, struct loclist *, struct attrlist *, int);
int defdevclass(const char *, struct loclist *, struct attrlist *, int);
void defdev(struct devbase *, struct loclist *, struct attrlist *, int);
void defdevattach(struct deva *, struct devbase *, struct nvlist *,
struct attrlist *);