[SPARC]: Add unique device_node IDs and a ".node" property.
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
fb7cd9d9ac
commit
87b385da1f
|
@ -407,7 +407,9 @@ static char * __init build_full_name(struct device_node *dp)
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct property * __init build_one_prop(phandle node, char *prev)
|
static unsigned int unique_id;
|
||||||
|
|
||||||
|
static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len)
|
||||||
{
|
{
|
||||||
static struct property *tmp = NULL;
|
static struct property *tmp = NULL;
|
||||||
struct property *p;
|
struct property *p;
|
||||||
|
@ -417,25 +419,34 @@ static struct property * __init build_one_prop(phandle node, char *prev)
|
||||||
p = tmp;
|
p = tmp;
|
||||||
memset(p, 0, sizeof(*p) + 32);
|
memset(p, 0, sizeof(*p) + 32);
|
||||||
tmp = NULL;
|
tmp = NULL;
|
||||||
} else
|
} else {
|
||||||
p = prom_early_alloc(sizeof(struct property) + 32);
|
p = prom_early_alloc(sizeof(struct property) + 32);
|
||||||
|
p->unique_id = unique_id++;
|
||||||
|
}
|
||||||
|
|
||||||
p->name = (char *) (p + 1);
|
p->name = (char *) (p + 1);
|
||||||
if (prev == NULL) {
|
if (special_name) {
|
||||||
prom_firstprop(node, p->name);
|
p->length = special_len;
|
||||||
|
p->value = prom_early_alloc(special_len);
|
||||||
|
memcpy(p->value, special_val, special_len);
|
||||||
} else {
|
} else {
|
||||||
prom_nextprop(node, prev, p->name);
|
if (prev == NULL) {
|
||||||
}
|
prom_firstprop(node, p->name);
|
||||||
if (strlen(p->name) == 0) {
|
} else {
|
||||||
tmp = p;
|
prom_nextprop(node, prev, p->name);
|
||||||
return NULL;
|
}
|
||||||
}
|
if (strlen(p->name) == 0) {
|
||||||
p->length = prom_getproplen(node, p->name);
|
tmp = p;
|
||||||
if (p->length <= 0) {
|
return NULL;
|
||||||
p->length = 0;
|
}
|
||||||
} else {
|
p->length = prom_getproplen(node, p->name);
|
||||||
p->value = prom_early_alloc(p->length);
|
if (p->length <= 0) {
|
||||||
len = prom_getproperty(node, p->name, p->value, p->length);
|
p->length = 0;
|
||||||
|
} else {
|
||||||
|
p->value = prom_early_alloc(p->length + 1);
|
||||||
|
prom_getproperty(node, p->name, p->value, p->length);
|
||||||
|
((unsigned char *)p->value)[p->length] = '\0';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
@ -444,9 +455,14 @@ static struct property * __init build_prop_list(phandle node)
|
||||||
{
|
{
|
||||||
struct property *head, *tail;
|
struct property *head, *tail;
|
||||||
|
|
||||||
head = tail = build_one_prop(node, NULL);
|
head = tail = build_one_prop(node, NULL,
|
||||||
|
".node", &node, sizeof(node));
|
||||||
|
|
||||||
|
tail->next = build_one_prop(node, NULL, NULL, NULL, 0);
|
||||||
|
tail = tail->next;
|
||||||
while(tail) {
|
while(tail) {
|
||||||
tail->next = build_one_prop(node, tail->name);
|
tail->next = build_one_prop(node, tail->name,
|
||||||
|
NULL, NULL, 0);
|
||||||
tail = tail->next;
|
tail = tail->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -475,6 +491,7 @@ static struct device_node * __init create_node(phandle node)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
dp = prom_early_alloc(sizeof(*dp));
|
dp = prom_early_alloc(sizeof(*dp));
|
||||||
|
dp->unique_id = unique_id++;
|
||||||
|
|
||||||
kref_init(&dp->kref);
|
kref_init(&dp->kref);
|
||||||
|
|
||||||
|
|
|
@ -584,7 +584,9 @@ static char * __init build_full_name(struct device_node *dp)
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct property * __init build_one_prop(phandle node, char *prev)
|
static unsigned int unique_id;
|
||||||
|
|
||||||
|
static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len)
|
||||||
{
|
{
|
||||||
static struct property *tmp = NULL;
|
static struct property *tmp = NULL;
|
||||||
struct property *p;
|
struct property *p;
|
||||||
|
@ -593,25 +595,35 @@ static struct property * __init build_one_prop(phandle node, char *prev)
|
||||||
p = tmp;
|
p = tmp;
|
||||||
memset(p, 0, sizeof(*p) + 32);
|
memset(p, 0, sizeof(*p) + 32);
|
||||||
tmp = NULL;
|
tmp = NULL;
|
||||||
} else
|
} else {
|
||||||
p = prom_early_alloc(sizeof(struct property) + 32);
|
p = prom_early_alloc(sizeof(struct property) + 32);
|
||||||
|
p->unique_id = unique_id++;
|
||||||
|
}
|
||||||
|
|
||||||
p->name = (char *) (p + 1);
|
p->name = (char *) (p + 1);
|
||||||
if (prev == NULL) {
|
if (special_name) {
|
||||||
prom_firstprop(node, p->name);
|
strcpy(p->name, special_name);
|
||||||
|
p->length = special_len;
|
||||||
|
p->value = prom_early_alloc(special_len);
|
||||||
|
memcpy(p->value, special_val, special_len);
|
||||||
} else {
|
} else {
|
||||||
prom_nextprop(node, prev, p->name);
|
if (prev == NULL) {
|
||||||
}
|
prom_firstprop(node, p->name);
|
||||||
if (strlen(p->name) == 0) {
|
} else {
|
||||||
tmp = p;
|
prom_nextprop(node, prev, p->name);
|
||||||
return NULL;
|
}
|
||||||
}
|
if (strlen(p->name) == 0) {
|
||||||
p->length = prom_getproplen(node, p->name);
|
tmp = p;
|
||||||
if (p->length <= 0) {
|
return NULL;
|
||||||
p->length = 0;
|
}
|
||||||
} else {
|
p->length = prom_getproplen(node, p->name);
|
||||||
p->value = prom_early_alloc(p->length);
|
if (p->length <= 0) {
|
||||||
prom_getproperty(node, p->name, p->value, p->length);
|
p->length = 0;
|
||||||
|
} else {
|
||||||
|
p->value = prom_early_alloc(p->length + 1);
|
||||||
|
prom_getproperty(node, p->name, p->value, p->length);
|
||||||
|
((unsigned char *)p->value)[p->length] = '\0';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
@ -620,9 +632,14 @@ static struct property * __init build_prop_list(phandle node)
|
||||||
{
|
{
|
||||||
struct property *head, *tail;
|
struct property *head, *tail;
|
||||||
|
|
||||||
head = tail = build_one_prop(node, NULL);
|
head = tail = build_one_prop(node, NULL,
|
||||||
|
".node", &node, sizeof(node));
|
||||||
|
|
||||||
|
tail->next = build_one_prop(node, NULL, NULL, NULL, 0);
|
||||||
|
tail = tail->next;
|
||||||
while(tail) {
|
while(tail) {
|
||||||
tail->next = build_one_prop(node, tail->name);
|
tail->next = build_one_prop(node, tail->name,
|
||||||
|
NULL, NULL, 0);
|
||||||
tail = tail->next;
|
tail = tail->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -651,6 +668,7 @@ static struct device_node * __init create_node(phandle node)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
dp = prom_early_alloc(sizeof(*dp));
|
dp = prom_early_alloc(sizeof(*dp));
|
||||||
|
dp->unique_id = unique_id++;
|
||||||
|
|
||||||
kref_init(&dp->kref);
|
kref_init(&dp->kref);
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,7 @@ struct property {
|
||||||
void *value;
|
void *value;
|
||||||
struct property *next;
|
struct property *next;
|
||||||
unsigned long _flags;
|
unsigned long _flags;
|
||||||
|
unsigned int unique_id;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct device_node {
|
struct device_node {
|
||||||
|
@ -59,6 +60,7 @@ struct device_node {
|
||||||
struct kref kref;
|
struct kref kref;
|
||||||
unsigned long _flags;
|
unsigned long _flags;
|
||||||
void *data;
|
void *data;
|
||||||
|
unsigned int unique_id;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* flag descriptions */
|
/* flag descriptions */
|
||||||
|
|
|
@ -36,6 +36,7 @@ struct property {
|
||||||
void *value;
|
void *value;
|
||||||
struct property *next;
|
struct property *next;
|
||||||
unsigned long _flags;
|
unsigned long _flags;
|
||||||
|
unsigned int unique_id;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct device_node {
|
struct device_node {
|
||||||
|
@ -59,6 +60,7 @@ struct device_node {
|
||||||
struct kref kref;
|
struct kref kref;
|
||||||
unsigned long _flags;
|
unsigned long _flags;
|
||||||
void *data;
|
void *data;
|
||||||
|
unsigned int unique_id;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* flag descriptions */
|
/* flag descriptions */
|
||||||
|
|
Loading…
Reference in a new issue