ucf and makefile fixes

diff --git a/Makefile b/Makefile
index 7763ba5378f1978733e3db0744ea8af42756f9ff..aab7d1759602ae6b86939a829ca5f729b81b7319 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ BITGEN_OPTS = \
        -g DonePipe:No \
        -g DriveDone:No
 
        -g DonePipe:No \
        -g DriveDone:No
 

-fpga_target: $(TARGET).vm6
+fpga_target: $(TARGET).jed

 
 $(TARGET).ngc: $(TARGET).xst $(VLOGS_ALL)
        @mkdir -p xst/projnav.tmp
 
 $(TARGET).ngc: $(TARGET).xst $(VLOGS_ALL)
        @mkdir -p xst/projnav.tmp


@@ -44,6 +44,9 @@ $(TARGET).ngd: $(TARGET).ngc $(TARGET).ucf
 $(TARGET).vm6: $(TARGET).ngd
        cpldfit -p $(CHIP) -power std $(TARGET).ngd -inputs 10 
 
 $(TARGET).vm6: $(TARGET).ngd
        cpldfit -p $(CHIP) -power std $(TARGET).ngd -inputs 10 
 

+$(TARGET).jed: $(TARGET).vm6
+       hprep6 -i $(TARGET).vm6
+

 $(TARGET)_map.ncd: $(TARGET).ngd
        map -p $(CHIP) -cm area -pr off -k 4 -c 100 -o $(TARGET)_map.ncd $(TARGET).ngd $(TARGET).pcf
 
 $(TARGET)_map.ncd: $(TARGET).ngd
        map -p $(CHIP) -cm area -pr off -k 4 -c 100 -o $(TARGET)_map.ncd $(TARGET).ngd $(TARGET).pcf
 

diff --git a/POSLink.ucf b/POSLink.ucf
index 6ac74b3be0f30623f58f155e0c158d716a9b24d1..b9f3ece1f0f2be99a28ba8bce32f166028e3fab2 100644 (file)
--- a/POSLink.ucf
+++ b/POSLink.ucf
@@ -6,7 +6,7 @@ NET "tos_inputs_e2<1>" LOC="P39";
 NET "tos_inputs_e2<2>" LOC="P32";
 NET "tos_inputs_e2<3>" LOC="P31";
 NET "tos_output"       LOC="P30";
 NET "tos_inputs_e2<2>" LOC="P32";
 NET "tos_inputs_e2<3>" LOC="P31";
 NET "tos_output"       LOC="P30";

-NET "data_output"      LOC="P5";
+NET "data_output"      LOC="P3";

 NET "serial_e2"        LOC="P2";
 NET "anode<0>"         LOC="P29";
 NET "anode<1>"         LOC="P28";
 NET "serial_e2"        LOC="P2";
 NET "anode<0>"         LOC="P29";
 NET "anode<1>"         LOC="P28";

diff --git a/POSLink.v b/POSLink.v
index 323e0d40af79fd24b4b9b0bc545fb85f3ef5b0ea..ce96bd0d4125ff5e6c99f88fff3299e6cbccb66e 100644 (file)
--- a/POSLink.v
+++ b/POSLink.v
@@ -49,7 +49,7 @@ wire [4:0] edge_counter;
                tos_select = data[11:10];
        end
 
                tos_select = data[11:10];
        end
 

-       wire [5:0] output_stuff = { buttons, tos_good };
+       wire [7:0] output_stuff = { 2'b0, buttons, tos_good };

 
        always @(*)
                data_output = output_stuff[current_bit[2:0]];
 
        always @(*)
                data_output = output_stuff[current_bit[2:0]];