electronics/ttl-fpga
1
0
Fork 0
Code Issues 1 Pull Requests Releases 1 Wiki Activity

Compare commits

base: electronics:f27c7284729ba3dc4c03d112314570a7f4ffca27
Branches Tags
electronics:sw
electronics:master
electronics:rev02
electronics:rev01
..
compare: electronics:0a493bdd2ad4e34e5eca559db14f05ea74e244c5
Branches Tags
electronics:master
electronics:sw
electronics:rev02
electronics:rev01

No commits in common. "f27c7284729ba3dc4c03d112314570a7f4ffca27" and "0a493bdd2ad4e34e5eca559db14f05ea74e244c5" have entirely different histories.
f27c728472 ... 0a493bdd2a

1 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

5
sw/kousaten/src/fpga_cell_lut34.c
View File

@ -39,7 +39,7 @@ static int LUT_IN_BITMAP[4][3] = {
/* LUT OUT MUX Definitions */ /* LUT OUT MUX Definitions */
static int LUT_OUT_MUX[4][4] = { static int LUT_OUT_MUX[4][4] = {
{LUT_OUT_C, LUT_OUT_A, LUT_OUT_B, LUT_OUT_B_ASYNC}, {LUT_OUT_C, LUT_OUT_A, LUT_OUT_B, LUT_OUT_B_ASYNC},
{LUT_OUT_C, LUT_OUT_B_ASYNC, LUT_OUT_A, LUT_OUT_A}, {LUT_OUT_C, LUT_OUT_B_ASYNC, LUT_OUT_B, LUT_OUT_A},
{LUT_OUT_C, LUT_OUT_A, LUT_OUT_B, LUT_OUT_B_ASYNC}, {LUT_OUT_C, LUT_OUT_A, LUT_OUT_B, LUT_OUT_B_ASYNC},
{LUT_OUT_C, LUT_OUT_B_ASYNC, LUT_OUT_B, LUT_OUT_A} {LUT_OUT_C, LUT_OUT_B_ASYNC, LUT_OUT_B, LUT_OUT_A}
}; };
@ -78,6 +78,8 @@ static int fpga_cell_lut34_lut_get_out_mux(int lut_group, char *ports) {
int i; int i;
int lut; int lut;
ports = ports + lut_group;
if (lut_group < 0 || lut_group > 2) { if (lut_group < 0 || lut_group > 2) {
report(LL_ERROR, report(LL_ERROR,
"Invalid LUT group requested."); "Invalid LUT group requested.");
@ -85,7 +87,6 @@ static int fpga_cell_lut34_lut_get_out_mux(int lut_group, char *ports) {
} }
lut = lut_group * 2; lut = lut_group * 2;
ports = ports + lut;
for (i = 0; i < 4; ++i) { for (i = 0; i < 4; ++i) {
if (ports[0] == LUT_OUT_DC || if (ports[0] == LUT_OUT_DC ||