From 4aff4458f58398f54c248604694c7005294c1747 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 12 Feb 2013 14:17:15 -0800 Subject: sconfig: rename pci_domain -> domain The name pci_domain was a bit misleading, since the construct is only PCI specific in a particular (northbridge/cpu) implementation, but not by concept. As implementations and hardware change, be more generic about our naming. This will allow us to support non-PCI systems without adding new keywords. Change-Id: Ide885a1d5e15d37560c79b936a39252150560e85 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/2376 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- util/sconfig/lex.yy.c_shipped | 172 ++++++++++++++++++------------------- util/sconfig/main.c | 10 +-- util/sconfig/sconfig.l | 2 +- util/sconfig/sconfig.tab.c_shipped | 4 +- util/sconfig/sconfig.tab.h_shipped | 2 +- util/sconfig/sconfig.y | 2 +- 6 files changed, 96 insertions(+), 96 deletions(-) (limited to 'util/sconfig') diff --git a/util/sconfig/lex.yy.c_shipped b/util/sconfig/lex.yy.c_shipped index 215da562ca..70d6f2e82e 100644 --- a/util/sconfig/lex.yy.c_shipped +++ b/util/sconfig/lex.yy.c_shipped @@ -377,21 +377,21 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[116] = +static yyconst flex_int16_t yy_accept[114] = { 0, 0, 0, 31, 29, 1, 3, 29, 29, 29, 25, 25, 23, 26, 29, 26, 26, 26, 29, 29, 29, 29, 29, 29, 29, 1, 3, 29, 0, 29, 0, 2, 25, 26, 29, 29, 29, 26, 29, 29, 29, - 29, 18, 29, 29, 29, 7, 29, 29, 29, 29, - 28, 28, 24, 29, 29, 29, 17, 22, 12, 29, - 29, 16, 29, 8, 9, 11, 29, 29, 27, 4, - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 13, 29, 29, 29, 5, 29, 10, 29, 29, 29, - 29, 20, 29, 29, 29, 29, 29, 29, 29, 29, - - 6, 29, 29, 29, 29, 29, 19, 29, 15, 29, - 29, 21, 29, 14, 0 + 29, 29, 18, 29, 29, 29, 7, 29, 29, 29, + 29, 28, 28, 24, 29, 29, 29, 29, 17, 22, + 12, 29, 29, 16, 29, 8, 9, 11, 29, 29, + 27, 4, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 13, 29, 29, 5, 15, 29, 10, + 29, 29, 29, 20, 29, 29, 29, 29, 29, 29, + + 6, 29, 29, 29, 29, 19, 29, 29, 29, 21, + 29, 14, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -434,94 +434,94 @@ static yyconst flex_int32_t yy_meta[39] = 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[121] = +static yyconst flex_int16_t yy_base[119] = { 0, - 0, 0, 181, 0, 178, 182, 176, 37, 41, 38, - 141, 0, 44, 163, 54, 58, 61, 45, 159, 53, - 52, 154, 139, 0, 171, 182, 80, 167, 84, 168, - 182, 0, 84, 87, 155, 144, 93, 137, 147, 147, - 141, 147, 132, 132, 139, 0, 135, 129, 135, 139, - 0, 182, 0, 145, 125, 129, 0, 0, 0, 132, - 122, 0, 126, 0, 134, 0, 124, 115, 0, 0, - 128, 114, 120, 125, 123, 109, 103, 119, 114, 119, - 112, 98, 92, 92, 0, 90, 107, 103, 94, 99, - 85, 0, 93, 91, 99, 83, 93, 81, 77, 86, - - 0, 83, 72, 64, 60, 59, 0, 42, 0, 52, - 43, 0, 16, 0, 182, 40, 129, 131, 133, 135 + 0, 0, 179, 0, 176, 180, 174, 37, 41, 38, + 139, 0, 44, 161, 54, 72, 57, 39, 157, 47, + 54, 152, 137, 0, 169, 180, 81, 165, 74, 166, + 180, 0, 80, 98, 153, 142, 87, 139, 134, 144, + 144, 138, 144, 129, 129, 136, 0, 132, 126, 132, + 136, 0, 180, 0, 142, 122, 126, 133, 0, 0, + 0, 128, 118, 0, 122, 0, 0, 0, 121, 112, + 0, 0, 125, 118, 110, 116, 121, 106, 100, 116, + 108, 110, 115, 117, 98, 89, 0, 0, 87, 98, + 94, 91, 77, 0, 83, 77, 70, 79, 67, 63, + + 0, 70, 61, 58, 65, 0, 40, 52, 49, 0, + 22, 0, 180, 40, 123, 125, 127, 129 } ; -static yyconst flex_int16_t yy_def[121] = +static yyconst flex_int16_t yy_def[119] = { 0, - 115, 1, 115, 116, 115, 115, 116, 117, 118, 116, - 10, 116, 10, 116, 10, 10, 10, 116, 116, 116, - 116, 116, 116, 116, 115, 115, 117, 119, 118, 120, - 115, 10, 10, 10, 116, 116, 10, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 115, 34, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 0, 115, 115, 115, 115, 115 + 113, 1, 113, 114, 113, 113, 114, 115, 116, 114, + 10, 114, 10, 114, 10, 10, 10, 114, 114, 114, + 114, 114, 114, 114, 113, 113, 115, 117, 116, 118, + 113, 10, 10, 10, 114, 114, 10, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + 114, 114, 113, 34, 114, 114, 114, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + 114, 114, 0, 113, 113, 113, 113, 113 } ; -static yyconst flex_int16_t yy_nxt[221] = +static yyconst flex_int16_t yy_nxt[219] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 10, 12, 13, 13, 14, 4, 4, 4, 13, 13, 15, 16, 17, 13, 4, 4, 18, 19, 4, 4, 20, 21, 4, 22, 23, 4, 4, 4, 4, 4, 28, 28, - 24, 24, 30, 31, 32, 32, 32, 114, 33, 33, - 33, 33, 33, 40, 33, 33, 33, 33, 33, 33, - 33, 33, 33, 113, 33, 33, 33, 33, 33, 33, - 47, 112, 41, 42, 45, 111, 43, 36, 37, 48, - 46, 28, 28, 110, 51, 30, 31, 109, 39, 38, - 33, 33, 33, 53, 53, 53, 108, 53, 53, 33, - - 33, 33, 107, 53, 53, 53, 53, 53, 53, 106, - 105, 104, 103, 102, 101, 100, 99, 98, 97, 96, - 95, 94, 93, 92, 91, 90, 89, 88, 56, 27, - 27, 29, 29, 28, 28, 30, 30, 87, 86, 85, - 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, - 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, - 64, 63, 62, 61, 60, 59, 58, 57, 55, 54, - 31, 52, 25, 50, 49, 44, 35, 34, 26, 25, - 115, 3, 115, 115, 115, 115, 115, 115, 115, 115, - 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, - - 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, - 115, 115, 115, 115, 115, 115, 115, 115, 115, 115 + 24, 24, 30, 31, 32, 32, 32, 41, 33, 33, + 33, 33, 33, 112, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 42, 43, 46, 111, + 44, 110, 48, 109, 47, 30, 31, 36, 33, 33, + 33, 49, 28, 28, 40, 52, 33, 33, 33, 108, + 107, 106, 37, 33, 33, 33, 105, 104, 103, 102, + + 38, 101, 100, 39, 54, 54, 54, 99, 54, 54, + 98, 97, 96, 95, 54, 54, 54, 54, 54, 54, + 94, 93, 57, 27, 27, 29, 29, 28, 28, 30, + 30, 92, 91, 90, 89, 88, 87, 86, 85, 84, + 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, + 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, + 63, 62, 61, 60, 59, 58, 56, 55, 31, 53, + 25, 51, 50, 45, 35, 34, 26, 25, 113, 3, + 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, + 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, + + 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, + 113, 113, 113, 113, 113, 113, 113, 113 } ; -static yyconst flex_int16_t yy_chk[221] = +static yyconst flex_int16_t yy_chk[219] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 8, 8, - 116, 8, 9, 9, 10, 10, 10, 113, 10, 10, - 13, 13, 13, 18, 10, 10, 10, 10, 10, 10, - 15, 15, 15, 111, 16, 16, 16, 17, 17, 17, - 21, 110, 18, 18, 20, 108, 18, 15, 16, 21, - 20, 27, 27, 106, 27, 29, 29, 105, 17, 16, - 33, 33, 33, 34, 34, 34, 104, 34, 34, 37, - - 37, 37, 103, 34, 34, 34, 34, 34, 34, 102, - 100, 99, 98, 97, 96, 95, 94, 93, 91, 90, - 89, 88, 87, 86, 84, 83, 82, 81, 37, 117, - 117, 118, 118, 119, 119, 120, 120, 80, 79, 78, - 77, 76, 75, 74, 73, 72, 71, 68, 67, 65, - 63, 61, 60, 56, 55, 54, 50, 49, 48, 47, - 45, 44, 43, 42, 41, 40, 39, 38, 36, 35, - 30, 28, 25, 23, 22, 19, 14, 11, 7, 5, - 3, 115, 115, 115, 115, 115, 115, 115, 115, 115, - 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, - - 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, - 115, 115, 115, 115, 115, 115, 115, 115, 115, 115 + 114, 8, 9, 9, 10, 10, 10, 18, 10, 10, + 13, 13, 13, 111, 10, 10, 10, 10, 10, 10, + 15, 15, 15, 17, 17, 17, 18, 18, 20, 109, + 18, 108, 21, 107, 20, 29, 29, 15, 16, 16, + 16, 21, 27, 27, 17, 27, 33, 33, 33, 105, + 104, 103, 16, 37, 37, 37, 102, 100, 99, 98, + + 16, 97, 96, 16, 34, 34, 34, 95, 34, 34, + 93, 92, 91, 90, 34, 34, 34, 34, 34, 34, + 89, 86, 37, 115, 115, 116, 116, 117, 117, 118, + 118, 85, 84, 83, 82, 81, 80, 79, 78, 77, + 76, 75, 74, 73, 70, 69, 65, 63, 62, 58, + 57, 56, 55, 51, 50, 49, 48, 46, 45, 44, + 43, 42, 41, 40, 39, 38, 36, 35, 30, 28, + 25, 23, 22, 19, 14, 11, 7, 5, 3, 113, + 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, + 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, + + 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, + 113, 113, 113, 113, 113, 113, 113, 113 } ; static yy_state_type yy_last_accepting_state; @@ -798,13 +798,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 116 ) + if ( yy_current_state >= 114 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 182 ); + while ( yy_base[yy_current_state] != 180 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -888,7 +888,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -{yylval.number=PCI_DOMAIN; return(BUS);} +{yylval.number=DOMAIN; return(BUS);} YY_BREAK case 16: YY_RULE_SETUP @@ -1242,7 +1242,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 116 ) + if ( yy_current_state >= 114 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1270,11 +1270,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 116 ) + if ( yy_current_state >= 114 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 115); + yy_is_jam = (yy_current_state == 113); return yy_is_jam ? 0 : yy_current_state; } diff --git a/util/sconfig/main.c b/util/sconfig/main.c index 8dfd50c47a..d87238f5ed 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -266,8 +266,8 @@ struct device *new_device(struct device *parent, struct device *busdev, const in new_d->path = ".type=DEVICE_PATH_APIC_CLUSTER,{.apic_cluster={ .cluster = 0x%x }}"; break; - case PCI_DOMAIN: - new_d->path = ".type=DEVICE_PATH_PCI_DOMAIN,{.pci_domain={ .domain = 0x%x }}"; + case DOMAIN: + new_d->path = ".type=DEVICE_PATH_DOMAIN,{.domain={ .domain = 0x%x }}"; break; case IOAPIC: @@ -342,7 +342,7 @@ void add_register(struct device *dev, char *name, char *val) { void add_pci_subsystem_ids(struct device *dev, int vendor, int device, int inherit) { - if (dev->bustype != PCI && dev->bustype != PCI_DOMAIN) { + if (dev->bustype != PCI && dev->bustype != DOMAIN) { printf("ERROR: 'subsystem' only allowed for PCI devices\n"); exit(1); } @@ -365,7 +365,7 @@ void add_ioapic_info(struct device *dev, int apicid, const char *_srcpin, int ir srcpin = _srcpin[3] - 'A'; - if (dev->bustype != PCI && dev->bustype != PCI_DOMAIN) { + if (dev->bustype != PCI && dev->bustype != DOMAIN) { printf("ERROR: ioapic config only allowed for PCI devices\n"); exit(1); } @@ -529,7 +529,7 @@ static void inherit_subsystem_ids(FILE *file, struct device *dev) for(p = dev; p && p != p->parent; p = p->parent) { - if (p->bustype != PCI && p->bustype != PCI_DOMAIN) + if (p->bustype != PCI && p->bustype != DOMAIN) continue; if (p->inherit_subsystem) { diff --git a/util/sconfig/sconfig.l b/util/sconfig/sconfig.l index 3f3ac5c874..48561717ff 100755 --- a/util/sconfig/sconfig.l +++ b/util/sconfig/sconfig.l @@ -39,7 +39,7 @@ pnp {yylval.number=PNP; return(BUS);} i2c {yylval.number=I2C; return(BUS);} lapic {yylval.number=APIC; return(BUS);} lapic_cluster {yylval.number=APIC_CLUSTER; return(BUS);} -pci_domain {yylval.number=PCI_DOMAIN; return(BUS);} +domain {yylval.number=DOMAIN; return(BUS);} irq {yylval.number=IRQ; return(RESOURCE);} drq {yylval.number=DRQ; return(RESOURCE);} io {yylval.number=IO; return(RESOURCE);} diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped index 170ae74390..7fa6988b57 100644 --- a/util/sconfig/sconfig.tab.c_shipped +++ b/util/sconfig/sconfig.tab.c_shipped @@ -133,7 +133,7 @@ static struct device *cur_parent, *cur_bus; I2C = 270, APIC = 271, APIC_CLUSTER = 272, - PCI_DOMAIN = 273, + DOMAIN = 273, IRQ = 274, DRQ = 275, IO = 276, @@ -478,7 +478,7 @@ static const char *const yytname[] = { "$end", "error", "$undefined", "CHIP", "DEVICE", "REGISTER", "BOOL", "BUS", "RESOURCE", "END", "EQUALS", "HEX", "STRING", "PCI", "PNP", "I2C", - "APIC", "APIC_CLUSTER", "PCI_DOMAIN", "IRQ", "DRQ", "IO", "NUMBER", + "APIC", "APIC_CLUSTER", "DOMAIN", "IRQ", "DRQ", "IO", "NUMBER", "SUBSYSTEMID", "INHERIT", "IOAPIC_IRQ", "IOAPIC", "PCIINT", "$accept", "devtree", "$@1", "chipchildren", "devicechildren", "chip", "@2", "device", "@3", "resource", "registers", "subsystemid", "ioapic_irq", 0 diff --git a/util/sconfig/sconfig.tab.h_shipped b/util/sconfig/sconfig.tab.h_shipped index 3b45778f64..e1257f94ba 100644 --- a/util/sconfig/sconfig.tab.h_shipped +++ b/util/sconfig/sconfig.tab.h_shipped @@ -52,7 +52,7 @@ I2C = 270, APIC = 271, APIC_CLUSTER = 272, - PCI_DOMAIN = 273, + DOMAIN = 273, IRQ = 274, DRQ = 275, IO = 276, diff --git a/util/sconfig/sconfig.y b/util/sconfig/sconfig.y index 12573a7d2d..9a133a7845 100755 --- a/util/sconfig/sconfig.y +++ b/util/sconfig/sconfig.y @@ -30,7 +30,7 @@ static struct device *cur_parent, *cur_bus; int number; } -%token CHIP DEVICE REGISTER BOOL BUS RESOURCE END EQUALS HEX STRING PCI PNP I2C APIC APIC_CLUSTER PCI_DOMAIN IRQ DRQ IO NUMBER SUBSYSTEMID INHERIT IOAPIC_IRQ IOAPIC PCIINT +%token CHIP DEVICE REGISTER BOOL BUS RESOURCE END EQUALS HEX STRING PCI PNP I2C APIC APIC_CLUSTER DOMAIN IRQ DRQ IO NUMBER SUBSYSTEMID INHERIT IOAPIC_IRQ IOAPIC PCIINT %% devtree: { cur_parent = cur_bus = head; } chip { postprocess_devtree(); } ; -- cgit v1.2.3