summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-09-24 11:41:45 +1000
committer Vas Crabb <vas@vastheman.com>2017-09-24 11:41:45 +1000
commita734a3b8e9fbe907a4894c7c8055d3faeac2bfda (patch)
tree288380af618dfa8b3dac3aea4f2496f0a51407ce /src/tools
parent56092fd848bff0e9985850cbb8ce11f701a9e7f3 (diff)
(nw) srcclean - please use UTF-8 for source files, stuff that isn't valid UTF-8 will be nuked, and cleaning it up by hand is annoying
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/jedutil.cpp158
1 files changed, 79 insertions, 79 deletions
diff --git a/src/tools/jedutil.cpp b/src/tools/jedutil.cpp
index 6bb0037e7f6..d1c49ec7a79 100644
--- a/src/tools/jedutil.cpp
+++ b/src/tools/jedutil.cpp
@@ -101,7 +101,7 @@
28-pin devices:
PLS100 = QP28 QF1928 (Tri-State)
- 82S100 = QP20 QF1928 (Tri-State)
+ 82S100 = QP20 QF1928 (Tri-State)
PLS101 = QP20 QF1928 (Open Collector)
82S101 = QP20 QF1928 (Open Collector)
@@ -618,16 +618,16 @@ static pin_fuse_rows pal20r8pinfuserows[] = {
{22, NO_OUTPUT_ENABLE_FUSE_ROW, 0, 280}}; /* Registered Output */
static pin_fuse_rows pal20ra10pinfuserows[] = {
- { 14, 0, 0, 0 }, /* Registered Output */
- { 15, 0, 0, 0 }, /* Registered Output */
- { 16, 0, 0, 0 }, /* Registered Output */
- { 17, 0, 0, 0 }, /* Registered Output */
- { 18, 0, 0, 0 }, /* Registered Output */
- { 19, 0, 0, 0 }, /* Registered Output */
- { 20, 0, 0, 0 }, /* Registered Output */
- { 21, 0, 0, 0 }, /* Registered Output */
- { 22, 0, 0, 0 }, /* Registered Output */
- { 23, 0, 0, 0 }}; /* Registered Output */
+ { 14, 0, 0, 0 }, /* Registered Output */
+ { 15, 0, 0, 0 }, /* Registered Output */
+ { 16, 0, 0, 0 }, /* Registered Output */
+ { 17, 0, 0, 0 }, /* Registered Output */
+ { 18, 0, 0, 0 }, /* Registered Output */
+ { 19, 0, 0, 0 }, /* Registered Output */
+ { 20, 0, 0, 0 }, /* Registered Output */
+ { 21, 0, 0, 0 }, /* Registered Output */
+ { 22, 0, 0, 0 }, /* Registered Output */
+ { 23, 0, 0, 0 }}; /* Registered Output */
static pin_fuse_rows pal20x4pinfuserows[] = {
{14, 1440, 1480, 1560},
@@ -942,14 +942,14 @@ static pin_fuse_rows pal20l2pinfuserows[] = {
{19, NO_OUTPUT_ENABLE_FUSE_ROW, 0, 280}};
static pin_fuse_rows _82s100_pls100_pinfuserows[] = {
- {18, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
- {17, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
- {16, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
- {15, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
- {13, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
- {12, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
- {11, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
- {10, NO_OUTPUT_ENABLE_FUSE_ROW, 0}};
+ {18, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
+ {17, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
+ {16, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
+ {15, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
+ {13, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
+ {12, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
+ {11, NO_OUTPUT_ENABLE_FUSE_ROW, 0},
+ {10, NO_OUTPUT_ENABLE_FUSE_ROW, 0}};
static pin_fuse_columns pal10l8pinfusecolumns[] = {
{1, 3, 2},
@@ -1368,26 +1368,26 @@ static pin_fuse_columns pal20r8pinfusecolumns[] = {
{23, 3, 2}};
static pin_fuse_columns pal20ra10pinfusecolumns[] = {
- {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 pal20x4pinfusecolumns[] = {
{2, 1, 0},
@@ -1957,22 +1957,22 @@ static pin_fuse_columns pal20l2pinfusecolumns[] = {
{23, 7, 6}};
static pin_fuse_columns _82s100_pls100_pinfusecolumns[] = {
- {9, 1, 0},
- {8, 3, 2},
- {7, 5, 4},
- {6, 7, 6},
- {5, 9, 8},
- {4, 11, 10},
- {3, 13, 12},
- {2, 15, 14},
- {27, 17, 16},
- {26, 19, 18},
- {25, 21, 20},
- {24, 23, 22},
- {23, 25, 24},
- {22, 27, 26},
- {21, 29, 28},
- {20, 31, 30}};
+ {9, 1, 0},
+ {8, 3, 2},
+ {7, 5, 4},
+ {6, 7, 6},
+ {5, 9, 8},
+ {4, 11, 10},
+ {3, 13, 12},
+ {2, 15, 14},
+ {27, 17, 16},
+ {26, 19, 18},
+ {25, 21, 20},
+ {24, 23, 22},
+ {23, 25, 24},
+ {22, 27, 26},
+ {21, 29, 28},
+ {20, 31, 30}};
static pal_data paldata[] = {
{"PAL10L8", 320,
@@ -2139,14 +2139,14 @@ static pal_data paldata[] = {
config_pal20r8_pins,
nullptr,
nullptr},
- {"PAL20RA10", 3210,
- pal20ra10pinfuserows, ARRAY_LENGTH(pal20ra10pinfuserows),
- pal20ra10pinfusecolumns, ARRAY_LENGTH(pal20ra10pinfusecolumns),
- print_pal20ra10_product_terms,
- config_pal20ra10_pins,
- nullptr,
- nullptr },
- {"PAL20X4", 1600,
+ {"PAL20RA10", 3210,
+ pal20ra10pinfuserows, ARRAY_LENGTH(pal20ra10pinfuserows),
+ pal20ra10pinfusecolumns, ARRAY_LENGTH(pal20ra10pinfusecolumns),
+ print_pal20ra10_product_terms,
+ config_pal20ra10_pins,
+ nullptr,
+ nullptr },
+ {"PAL20X4", 1600,
pal20x4pinfuserows, ARRAY_LENGTH(pal20x4pinfuserows),
pal20x4pinfusecolumns, ARRAY_LENGTH(pal20x4pinfusecolumns),
print_pal20x4_product_terms,
@@ -3668,7 +3668,7 @@ terms for a PAL20RA10
static void print_pal20ra10_product_terms(const pal_data* pal, const jed_data* jed)
{
- print_product_terms(pal, jed);
+ print_product_terms(pal, jed);
}
@@ -5834,21 +5834,21 @@ a PAL20RA10
static void config_pal20ra10_pins(const pal_data* pal, const jed_data* jed)
{
- static uint16_t input_pins[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 };
- static pin_output_config output_pins[] = {
- {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},
- {18, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED},
- {19, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED},
- {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}};
-
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ static uint16_t input_pins[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 };
+ static pin_output_config output_pins[] = {
+ {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},
+ {18, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED},
+ {19, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED},
+ {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}};
+
+ set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
}