diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2013-09-17 06:47:03 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2013-09-17 06:47:03 +0000 |
commit | 96aa5e1c086b4927456dc88b925d8ec112f0482e (patch) | |
tree | f59d136c51d4a065f39e3ab0d73981526c4d156b /src/tools | |
parent | a7d12daf5b4c3374e8ad47a003ac7fff73d5c8fc (diff) |
Cleanups and version bumpmame0150
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/jedutil.c | 600 |
1 files changed, 300 insertions, 300 deletions
diff --git a/src/tools/jedutil.c b/src/tools/jedutil.c index 52dff1f1b29..d290fcc5295 100644 --- a/src/tools/jedutil.c +++ b/src/tools/jedutil.c @@ -514,64 +514,64 @@ static pin_fuse_rows pal20r8pinfuserows[] = { {22, NO_OUTPUT_ENABLE_FUSE_ROW, 0, 280}}; /* Registered Output */ static pin_fuse_rows pal20x4pinfuserows[] = { - {14, 1440, 1480, 1560}, - {15, 1280, 1320, 1400}, - {16, 1120, 1160, 1240}, - {17, NO_OUTPUT_ENABLE_FUSE_ROW, 960, 1080}, /* Registered Output */ - {18, NO_OUTPUT_ENABLE_FUSE_ROW, 800, 920}, /* Registered Output */ - {19, NO_OUTPUT_ENABLE_FUSE_ROW, 640, 760}, /* Registered Output */ - {20, NO_OUTPUT_ENABLE_FUSE_ROW, 480, 600}, /* Registered Output */ - {21, 320, 360, 440}, - {22, 160, 200, 280}, - {23, 0, 40, 120}}; + {14, 1440, 1480, 1560}, + {15, 1280, 1320, 1400}, + {16, 1120, 1160, 1240}, + {17, NO_OUTPUT_ENABLE_FUSE_ROW, 960, 1080}, /* Registered Output */ + {18, NO_OUTPUT_ENABLE_FUSE_ROW, 800, 920}, /* Registered Output */ + {19, NO_OUTPUT_ENABLE_FUSE_ROW, 640, 760}, /* Registered Output */ + {20, NO_OUTPUT_ENABLE_FUSE_ROW, 480, 600}, /* Registered Output */ + {21, 320, 360, 440}, + {22, 160, 200, 280}, + {23, 0, 40, 120}}; static pin_fuse_rows pal20x8pinfuserows[] = { - {14, 1440, 1480, 1560}, - {15, NO_OUTPUT_ENABLE_FUSE_ROW, 1280, 1400}, /* Registered Output */ - {16, NO_OUTPUT_ENABLE_FUSE_ROW, 1120, 1240}, /* Registered Output */ - {17, NO_OUTPUT_ENABLE_FUSE_ROW, 960, 1080}, /* Registered Output */ - {18, NO_OUTPUT_ENABLE_FUSE_ROW, 800, 920}, /* Registered Output */ - {19, NO_OUTPUT_ENABLE_FUSE_ROW, 640, 760}, /* Registered Output */ - {20, NO_OUTPUT_ENABLE_FUSE_ROW, 480, 600}, /* Registered Output */ - {21, NO_OUTPUT_ENABLE_FUSE_ROW, 320, 440}, /* Registered Output */ - {22, NO_OUTPUT_ENABLE_FUSE_ROW, 160, 280}, /* Registered Output */ - {23, 0, 40, 120}}; + {14, 1440, 1480, 1560}, + {15, NO_OUTPUT_ENABLE_FUSE_ROW, 1280, 1400}, /* Registered Output */ + {16, NO_OUTPUT_ENABLE_FUSE_ROW, 1120, 1240}, /* Registered Output */ + {17, NO_OUTPUT_ENABLE_FUSE_ROW, 960, 1080}, /* Registered Output */ + {18, NO_OUTPUT_ENABLE_FUSE_ROW, 800, 920}, /* Registered Output */ + {19, NO_OUTPUT_ENABLE_FUSE_ROW, 640, 760}, /* Registered Output */ + {20, NO_OUTPUT_ENABLE_FUSE_ROW, 480, 600}, /* Registered Output */ + {21, NO_OUTPUT_ENABLE_FUSE_ROW, 320, 440}, /* Registered Output */ + {22, NO_OUTPUT_ENABLE_FUSE_ROW, 160, 280}, /* Registered Output */ + {23, 0, 40, 120}}; static pin_fuse_rows pal20x10pinfuserows[] = { - {14, NO_OUTPUT_ENABLE_FUSE_ROW, 1440, 1560}, /* Registered Output */ - {15, NO_OUTPUT_ENABLE_FUSE_ROW, 1280, 1400}, /* Registered Output */ - {16, NO_OUTPUT_ENABLE_FUSE_ROW, 1120, 1240}, /* Registered Output */ - {17, NO_OUTPUT_ENABLE_FUSE_ROW, 960, 1080}, /* Registered Output */ - {18, NO_OUTPUT_ENABLE_FUSE_ROW, 800, 920}, /* Registered Output */ - {19, NO_OUTPUT_ENABLE_FUSE_ROW, 640, 760}, /* Registered Output */ - {20, NO_OUTPUT_ENABLE_FUSE_ROW, 480, 600}, /* Registered Output */ - {21, NO_OUTPUT_ENABLE_FUSE_ROW, 320, 440}, /* Registered Output */ - {22, NO_OUTPUT_ENABLE_FUSE_ROW, 160, 280}, /* Registered Output */ - {23, NO_OUTPUT_ENABLE_FUSE_ROW, 0, 120}}; /* Registered Output */ + {14, NO_OUTPUT_ENABLE_FUSE_ROW, 1440, 1560}, /* Registered Output */ + {15, NO_OUTPUT_ENABLE_FUSE_ROW, 1280, 1400}, /* Registered Output */ + {16, NO_OUTPUT_ENABLE_FUSE_ROW, 1120, 1240}, /* Registered Output */ + {17, NO_OUTPUT_ENABLE_FUSE_ROW, 960, 1080}, /* Registered Output */ + {18, NO_OUTPUT_ENABLE_FUSE_ROW, 800, 920}, /* Registered Output */ + {19, NO_OUTPUT_ENABLE_FUSE_ROW, 640, 760}, /* Registered Output */ + {20, NO_OUTPUT_ENABLE_FUSE_ROW, 480, 600}, /* Registered Output */ + {21, NO_OUTPUT_ENABLE_FUSE_ROW, 320, 440}, /* Registered Output */ + {22, NO_OUTPUT_ENABLE_FUSE_ROW, 160, 280}, /* Registered Output */ + {23, NO_OUTPUT_ENABLE_FUSE_ROW, 0, 120}}; /* Registered Output */ static pin_fuse_rows _82s153_pls153pinfuserows[] = { - {9, 1472, 0, 0}, - {11, 1508, 0, 0}, - {12, 1544, 0, 0}, - {13, 1580, 0, 0}, - {14, 1616, 0, 0}, - {15, 1652, 0, 0}, - {16, 1688, 0, 0}, - {17, 1724, 0, 0}, - {18, 1760, 0, 0}, - {19, 1796, 0, 0}}; + {9, 1472, 0, 0}, + {11, 1508, 0, 0}, + {12, 1544, 0, 0}, + {13, 1580, 0, 0}, + {14, 1616, 0, 0}, + {15, 1652, 0, 0}, + {16, 1688, 0, 0}, + {17, 1724, 0, 0}, + {18, 1760, 0, 0}, + {19, 1796, 0, 0}}; static pin_fuse_rows ck2605pinfuserows[] = { - {9, 736, 0, 0}, - {11, 772, 0, 0}, - {12, 808, 0, 0}, - {13, 844, 0, 0}, - {14, 880, 0, 0}, - {15, 916, 0, 0}, - {16, 952, 0, 0}, - {17, 988, 0, 0}, - {18, 1024, 0, 0}, - {19, 1060, 0, 0}}; + {9, 736, 0, 0}, + {11, 772, 0, 0}, + {12, 808, 0, 0}, + {13, 844, 0, 0}, + {14, 880, 0, 0}, + {15, 916, 0, 0}, + {16, 952, 0, 0}, + {17, 988, 0, 0}, + {18, 1024, 0, 0}, + {19, 1060, 0, 0}}; static pin_fuse_columns pal10l8pinfusecolumns[] = { {1, 3, 2}, @@ -970,111 +970,111 @@ static pin_fuse_columns pal20r8pinfusecolumns[] = { {23, 3, 2}}; static pin_fuse_columns pal20x4pinfusecolumns[] = { - {2, 1, 0}, - {3, 5, 4}, - {4, 9, 8}, - {5, 13, 12}, - {6, 17, 16}, - {7, 21, 20}, - {8, 25, 24}, - {9, 29, 28}, - {10, 33, 32}, - {11, 37, 36}, - {14, 39, 38}, - {15, 35, 34}, - {16, 31, 30}, - {17, 27, 26}, - {18, 23, 22}, - {19, 19, 18}, - {20, 15, 14}, - {21, 11, 10}, - {22, 7, 6}, - {23, 3, 2}}; + {2, 1, 0}, + {3, 5, 4}, + {4, 9, 8}, + {5, 13, 12}, + {6, 17, 16}, + {7, 21, 20}, + {8, 25, 24}, + {9, 29, 28}, + {10, 33, 32}, + {11, 37, 36}, + {14, 39, 38}, + {15, 35, 34}, + {16, 31, 30}, + {17, 27, 26}, + {18, 23, 22}, + {19, 19, 18}, + {20, 15, 14}, + {21, 11, 10}, + {22, 7, 6}, + {23, 3, 2}}; static pin_fuse_columns pal20x8pinfusecolumns[] = { - {2, 1, 0}, - {3, 5, 4}, - {4, 9, 8}, - {5, 13, 12}, - {6, 17, 16}, - {7, 21, 20}, - {8, 25, 24}, - {9, 29, 28}, - {10, 33, 32}, - {11, 37, 36}, - {14, 39, 38}, - {15, 35, 34}, - {16, 31, 30}, - {17, 27, 26}, - {18, 23, 22}, - {19, 19, 18}, - {20, 15, 14}, - {21, 11, 10}, - {22, 7, 6}, - {23, 3, 2}}; + {2, 1, 0}, + {3, 5, 4}, + {4, 9, 8}, + {5, 13, 12}, + {6, 17, 16}, + {7, 21, 20}, + {8, 25, 24}, + {9, 29, 28}, + {10, 33, 32}, + {11, 37, 36}, + {14, 39, 38}, + {15, 35, 34}, + {16, 31, 30}, + {17, 27, 26}, + {18, 23, 22}, + {19, 19, 18}, + {20, 15, 14}, + {21, 11, 10}, + {22, 7, 6}, + {23, 3, 2}}; static pin_fuse_columns pal20x10pinfusecolumns[] = { - {2, 1, 0}, - {3, 5, 4}, - {4, 9, 8}, - {5, 13, 12}, - {6, 17, 16}, - {7, 21, 20}, - {8, 25, 24}, - {9, 29, 28}, - {10, 33, 32}, - {11, 37, 36}, - {14, 39, 38}, - {15, 35, 34}, - {16, 31, 30}, - {17, 27, 26}, - {18, 23, 22}, - {19, 19, 18}, - {20, 15, 14}, - {21, 11, 10}, - {22, 7, 6}, - {23, 3, 2} + {2, 1, 0}, + {3, 5, 4}, + {4, 9, 8}, + {5, 13, 12}, + {6, 17, 16}, + {7, 21, 20}, + {8, 25, 24}, + {9, 29, 28}, + {10, 33, 32}, + {11, 37, 36}, + {14, 39, 38}, + {15, 35, 34}, + {16, 31, 30}, + {17, 27, 26}, + {18, 23, 22}, + {19, 19, 18}, + {20, 15, 14}, + {21, 11, 10}, + {22, 7, 6}, + {23, 3, 2} }; static pin_fuse_columns _82s153_pls153pinfusecolumns[] = { - {1, 1, 0}, - {2, 3, 2}, - {3, 5, 4}, - {4, 7, 6}, - {5, 9, 8}, - {6, 11, 10}, - {7, 13, 12}, - {8, 15, 14}, - {9, 17, 16}, - {11, 19, 18}, - {12, 21, 20}, - {13, 23, 22}, - {14, 25, 24}, - {15, 27, 26}, - {16, 29, 28}, - {17, 31, 30}, - {18, 33, 32}, - {19, 35, 34}}; + {1, 1, 0}, + {2, 3, 2}, + {3, 5, 4}, + {4, 7, 6}, + {5, 9, 8}, + {6, 11, 10}, + {7, 13, 12}, + {8, 15, 14}, + {9, 17, 16}, + {11, 19, 18}, + {12, 21, 20}, + {13, 23, 22}, + {14, 25, 24}, + {15, 27, 26}, + {16, 29, 28}, + {17, 31, 30}, + {18, 33, 32}, + {19, 35, 34}}; static pin_fuse_columns ck2605pinfusecolumns[] = { - {1, 1, 0}, - {2, 3, 2}, - {3, 5, 4}, - {4, 7, 6}, - {5, 9, 8}, - {6, 11, 10}, - {7, 13, 12}, - {8, 15, 14}, - {9, 17, 16}, - {11, 19, 18}, - {12, 21, 20}, - {13, 23, 22}, - {14, 25, 24}, - {15, 27, 26}, - {16, 29, 28}, - {17, 31, 30}, - {18, 33, 32}, - {19, 35, 34}}; + {1, 1, 0}, + {2, 3, 2}, + {3, 5, 4}, + {4, 7, 6}, + {5, 9, 8}, + {6, 11, 10}, + {7, 13, 12}, + {8, 15, 14}, + {9, 17, 16}, + {11, 19, 18}, + {12, 21, 20}, + {13, 23, 22}, + {14, 25, 24}, + {15, 27, 26}, + {16, 29, 28}, + {17, 31, 30}, + {18, 33, 32}, + {19, 35, 34}}; static pal_data paldata[] = { {"PAL10L8", @@ -1172,12 +1172,12 @@ static pal_data paldata[] = { /*{"PAL16RA8", NULL, 0, NULL, 0, NULL, NULL, NULL, NULL}, {"PAL16V8R", NULL, 0, NULL, 0, NULL, NULL, NULL, NULL},*/ {"PALCE16V8", - palce16v8pinfuserows, ARRAY_LEN(palce16v8pinfuserows), - palce16v8pinfusecolumns, ARRAY_LEN(palce16v8pinfusecolumns), + palce16v8pinfuserows, ARRAY_LEN(palce16v8pinfuserows), + palce16v8pinfusecolumns, ARRAY_LEN(palce16v8pinfusecolumns), print_palce16v8_product_terms, config_palce16v8_pins, - NULL, - NULL}, + NULL, + NULL}, {"GAL16V8", gal16v8pinfuserows, ARRAY_LEN(gal16v8pinfuserows), gal16v8pinfusecolumns, ARRAY_LEN(gal16v8pinfusecolumns), @@ -1192,7 +1192,7 @@ static pal_data paldata[] = { config_peel18cv8_pins, NULL, get_peel18cv8_pin_fuse_state}, - {"GAL18V10", + {"GAL18V10", gal18v10pinfuserows, ARRAY_LEN(gal18v10pinfuserows), gal18v10pinfusecolumns, ARRAY_LEN(gal18v10pinfusecolumns), print_gal18v10_product_terms, @@ -1273,7 +1273,7 @@ static pal_data paldata[] = { config_82s153_pls153_pins, NULL, NULL}, - {"CK2605", + {"CK2605", ck2605pinfuserows, ARRAY_LEN(ck2605pinfuserows), ck2605pinfusecolumns, ARRAY_LEN(ck2605pinfusecolumns), print_ck2605_product_terms, @@ -2140,7 +2140,7 @@ static void print_pal16r8_product_terms(const pal_data* pal, const jed_data* jed static void print_palce16v8_product_terms(const pal_data* pal, const jed_data* jed) { - fprintf(stderr, "Printing product terms for PALCE16V8 not supported!\n"); + fprintf(stderr, "Printing product terms for PALCE16V8 not supported!\n"); /*print_product_terms(pal, jed);*/ } @@ -2347,7 +2347,7 @@ static void print_82s153_pls153_product_terms(const pal_data* pal, const jed_dat printf("Equations:\n\n"); for (index = 0; index < outputpinscount; ++index) - { + { flags = outputpins[index].flags; indent = 0; @@ -2363,51 +2363,51 @@ static void print_82s153_pls153_product_terms(const pal_data* pal, const jed_dat printf("%s", buffer); - haveterms = 0; + haveterms = 0; indent += strlen(buffer); fuse_rows = find_fuse_rows(pal, outputpins[index].pin); - fuserow = 0; - - if (outputpins[index].pin != 9) - { - or_column = 19 - outputpins[index].pin; - } - else - { - or_column = 9; - } - - for (row = 0; row < 32; ++row) - { - if (!jed_get_fuse(jed, fuserow + columncount + or_column)) - { - generate_product_terms(pal, jed, fuserow, buffer); - - if (strlen(buffer) > 0) - { - if (haveterms) - { - printf(" +\n"); - - for (indentindex = 0; indentindex < indent; ++indentindex) - { - printf(" "); - } - } - else - { - haveterms = 1; - } - - printf("%s", buffer); - } - } - - fuserow += (columncount + 10); - } - - printf("\n"); + fuserow = 0; + + if (outputpins[index].pin != 9) + { + or_column = 19 - outputpins[index].pin; + } + else + { + or_column = 9; + } + + for (row = 0; row < 32; ++row) + { + if (!jed_get_fuse(jed, fuserow + columncount + or_column)) + { + generate_product_terms(pal, jed, fuserow, buffer); + + if (strlen(buffer) > 0) + { + if (haveterms) + { + printf(" +\n"); + + for (indentindex = 0; indentindex < indent; ++indentindex) + { + printf(" "); + } + } + else + { + haveterms = 1; + } + + printf("%s", buffer); + } + } + + fuserow += (columncount + 10); + } + + printf("\n"); /* output enable equations */ @@ -2425,7 +2425,7 @@ static void print_82s153_pls153_product_terms(const pal_data* pal, const jed_dat } printf("\n"); - } + } } @@ -2450,7 +2450,7 @@ static void print_ck2605_product_terms(const pal_data* pal, const jed_data* jed) printf("Equations:\n\n"); for (index = 0; index < outputpinscount; ++index) - { + { flags = outputpins[index].flags; indent = 0; @@ -2466,51 +2466,51 @@ static void print_ck2605_product_terms(const pal_data* pal, const jed_data* jed) printf("%s", buffer); - haveterms = 0; + haveterms = 0; indent += strlen(buffer); fuse_rows = find_fuse_rows(pal, outputpins[index].pin); - fuserow = 0; - - if (outputpins[index].pin != 9) - { - or_column = 19 - outputpins[index].pin; - } - else - { - or_column = 9; - } - - for (row = 0; row < 16; ++row) - { - if (!jed_get_fuse(jed, fuserow + columncount + or_column)) - { - generate_product_terms(pal, jed, fuserow, buffer); - - if (strlen(buffer) > 0) - { - if (haveterms) - { - printf(" +\n"); - - for (indentindex = 0; indentindex < indent; ++indentindex) - { - printf(" "); - } - } - else - { - haveterms = 1; - } - - printf("%s", buffer); - } - } - - fuserow += (columncount + 10); - } - - printf("\n"); + fuserow = 0; + + if (outputpins[index].pin != 9) + { + or_column = 19 - outputpins[index].pin; + } + else + { + or_column = 9; + } + + for (row = 0; row < 16; ++row) + { + if (!jed_get_fuse(jed, fuserow + columncount + or_column)) + { + generate_product_terms(pal, jed, fuserow, buffer); + + if (strlen(buffer) > 0) + { + if (haveterms) + { + printf(" +\n"); + + for (indentindex = 0; indentindex < indent; ++indentindex) + { + printf(" "); + } + } + else + { + haveterms = 1; + } + + printf("%s", buffer); + } + } + + fuserow += (columncount + 10); + } + + printf("\n"); /* output enable equations */ @@ -2528,7 +2528,7 @@ static void print_ck2605_product_terms(const pal_data* pal, const jed_data* jed) } printf("\n"); - } + } } @@ -2888,7 +2888,7 @@ static void config_palce16v8_pins(const pal_data* pal, const jed_data* jed) struct _output_logic_macrocell { UINT16 pin; - UINT16 sl0_fuse; /* registers allowed */ + UINT16 sl0_fuse; /* registers allowed */ UINT16 sl1_fuse; /* output polarity 0 - low, 1 - high */ }; @@ -2901,40 +2901,40 @@ static void config_palce16v8_pins(const pal_data* pal, const jed_data* jed) {17, 2122, 2050}, {18, 2121, 2049}, {19, 2120, 2048}}; - UINT16 sg0 = 2192; /* guessing on fuse here */ - UINT16 sg1 = 2193; /* guessing on fuse here */ - UINT16 index; - - for (index = 0; index < ARRAY_LEN(macrocells); ++index) - { - if (jed_get_fuse(jed, sg0)) - { - /* Device uses no registers */ - - if (jed_get_fuse(jed, sg1)) - { - /* Combinatorial I/O */ - } - else - { - /* Combinatorial Output or Input */ - } - } - else - { - /* Device uses registers */ - - if (jed_get_fuse(jed, sg1)) - { - } - else - { - fprintf(stderr, "Unknown configuration type!\n"); - } - } - } - - /* 2056 - 2119 are the 64 bit signature fuses */ + UINT16 sg0 = 2192; /* guessing on fuse here */ + UINT16 sg1 = 2193; /* guessing on fuse here */ + UINT16 index; + + for (index = 0; index < ARRAY_LEN(macrocells); ++index) + { + if (jed_get_fuse(jed, sg0)) + { + /* Device uses no registers */ + + if (jed_get_fuse(jed, sg1)) + { + /* Combinatorial I/O */ + } + else + { + /* Combinatorial Output or Input */ + } + } + else + { + /* Device uses registers */ + + if (jed_get_fuse(jed, sg1)) + { + } + else + { + fprintf(stderr, "Unknown configuration type!\n"); + } + } + } + + /* 2056 - 2119 are the 64 bit signature fuses */ fprintf(stderr, "Configuring product terms for PALCE16V8 not supported!\n"); } @@ -3641,7 +3641,7 @@ static void config_pal20x4_pins(const pal_data* pal, const jed_data* jed) { static UINT16 input_pins[] = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23}; static pin_output_config output_pins[] = { - {14, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}, + {14, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}, {15, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}, {16, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}, {17, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, @@ -3650,7 +3650,7 @@ static void config_pal20x4_pins(const pal_data* pal, const jed_data* jed) {20, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, {21, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}, {22, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}, - {23, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}}; + {23, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}}; set_input_pins(input_pins, ARRAY_LEN(input_pins)); set_output_pins(output_pins, ARRAY_LEN(output_pins)); @@ -3665,7 +3665,7 @@ static void config_pal20x8_pins(const pal_data* pal, const jed_data* jed) { static UINT16 input_pins[] = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23}; static pin_output_config output_pins[] = { - {14, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}, + {14, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}, {15, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, {16, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, {17, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, @@ -3674,7 +3674,7 @@ static void config_pal20x8_pins(const pal_data* pal, const jed_data* jed) {20, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, {21, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, {22, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, - {23, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}}; + {23, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}}; set_input_pins(input_pins, ARRAY_LEN(input_pins)); set_output_pins(output_pins, ARRAY_LEN(output_pins)); @@ -3691,7 +3691,7 @@ static void config_pal20x10_pins(const pal_data* pal, const jed_data* jed) { static UINT16 input_pins[] = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23}; static pin_output_config output_pins[] = { - {14, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, + {14, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, {15, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, {16, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, {17, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, @@ -3700,7 +3700,7 @@ static void config_pal20x10_pins(const pal_data* pal, const jed_data* jed) {20, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, {21, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, {22, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}, - {23, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}}; + {23, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}}; set_input_pins(input_pins, ARRAY_LEN(input_pins)); set_output_pins(output_pins, ARRAY_LEN(output_pins)); @@ -3721,12 +3721,12 @@ static void config_82s153_pls153_pins(const pal_data* pal, const jed_data* jed) output_pin_count = 0; - for (index = 0; index < pal->pinfuserowscount; ++index) - { - if (does_output_enable_fuse_row_allow_output(pal, jed, pal->pinfuserows[index].fuserowoutputenable)) - { - output_pins[output_pin_count].pin = pal->pinfuserows[index].pin; - output_pins[output_pin_count].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT; + for (index = 0; index < pal->pinfuserowscount; ++index) + { + if (does_output_enable_fuse_row_allow_output(pal, jed, pal->pinfuserows[index].fuserowoutputenable)) + { + output_pins[output_pin_count].pin = pal->pinfuserows[index].pin; + output_pins[output_pin_count].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT; if (jed_get_fuse(jed, 1832 + (9 - index))) { @@ -3737,9 +3737,9 @@ static void config_82s153_pls153_pins(const pal_data* pal, const jed_data* jed) output_pins[output_pin_count].flags |= OUTPUT_ACTIVEHIGH; } - ++output_pin_count; - } - } + ++output_pin_count; + } + } set_input_pins(input_pins, ARRAY_LEN(input_pins)); set_output_pins(output_pins, output_pin_count); @@ -3760,12 +3760,12 @@ static void config_ck2605_pins(const pal_data* pal, const jed_data* jed) output_pin_count = 0; - for (index = 0; index < pal->pinfuserowscount; ++index) - { - if (does_output_enable_fuse_row_allow_output(pal, jed, pal->pinfuserows[index].fuserowoutputenable)) - { - output_pins[output_pin_count].pin = pal->pinfuserows[index].pin; - output_pins[output_pin_count].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT; + for (index = 0; index < pal->pinfuserowscount; ++index) + { + if (does_output_enable_fuse_row_allow_output(pal, jed, pal->pinfuserows[index].fuserowoutputenable)) + { + output_pins[output_pin_count].pin = pal->pinfuserows[index].pin; + output_pins[output_pin_count].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT; if (jed_get_fuse(jed, 1096 + (9 - index))) { @@ -3776,9 +3776,9 @@ static void config_ck2605_pins(const pal_data* pal, const jed_data* jed) output_pins[output_pin_count].flags |= OUTPUT_ACTIVEHIGH; } - ++output_pin_count; - } - } + ++output_pin_count; + } + } set_input_pins(input_pins, ARRAY_LEN(input_pins)); set_output_pins(output_pins, output_pin_count); |