diff options
Diffstat (limited to 'util/sconfig/sconfig.y')
| -rwxr-xr-x | util/sconfig/sconfig.y | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/util/sconfig/sconfig.y b/util/sconfig/sconfig.y index c289c9e26d..a355c77c56 100755 --- a/util/sconfig/sconfig.y +++ b/util/sconfig/sconfig.y @@ -21,12 +21,12 @@ int yylex(); void yyerror(const char *s); static struct device *cur_parent; -static struct chip *cur_chip; +static struct chip_instance *cur_chip_instance; %} %union { struct device *device; - struct chip *chip; + struct chip_instance *chip_instance; char *string; int number; } @@ -40,16 +40,16 @@ chipchildren: chipchildren device | chipchildren chip | chipchildren registers | devicechildren: devicechildren device | devicechildren chip | devicechildren resource | devicechildren subsystemid | devicechildren ioapic_irq | /* empty */ ; chip: CHIP STRING /* == path */ { - $<chip>$ = new_chip($<string>2); - chip_enqueue_tail(cur_chip); - cur_chip = $<chip>$; + $<chip_instance>$ = new_chip_instance($<string>2); + chip_enqueue_tail(cur_chip_instance); + cur_chip_instance = $<chip_instance>$; } chipchildren END { - cur_chip = chip_dequeue_tail(); + cur_chip_instance = chip_dequeue_tail(); }; device: DEVICE BUS NUMBER /* == devnum */ BOOL { - $<device>$ = new_device(cur_parent, cur_chip, $<number>2, $<string>3, $<number>4); + $<device>$ = new_device(cur_parent, cur_chip_instance, $<number>2, $<string>3, $<number>4); cur_parent = $<device>$; } devicechildren END { @@ -62,7 +62,7 @@ resource: RESOURCE NUMBER /* == resnum */ EQUALS NUMBER /* == resval */ { add_resource(cur_parent, $<number>1, strtol($<string>2, NULL, 0), strtol($<string>4, NULL, 0)); } ; registers: REGISTER STRING /* == regname */ EQUALS STRING /* == regval */ - { add_register(cur_chip, $<string>2, $<string>4); } ; + { add_register(cur_chip_instance, $<string>2, $<string>4); } ; subsystemid: SUBSYSTEMID NUMBER NUMBER { add_pci_subsystem_ids(cur_parent, strtol($<string>2, NULL, 16), strtol($<string>3, NULL, 16), 0); }; |