fix input of program in tesbed
Stefan Schuermans

Stefan Schuermans commited on 2012-02-09 20:43:40
Showing 3 changed files, with 9 additions and 5 deletions.

... ...
@@ -24,7 +24,7 @@ fw.bin: fw
24 24
 	$(OBJCOPY) -O binary $< $@
25 25
 
26 26
 fw.dat: fw.bin
27
-	hexdump -e '1/4 "%d\n"' -v $< >$@
27
+	hexdump -e '2/2 "%u " "\n"' -v $< >$@
28 28
 
29 29
 clean:
30 30
 	rm -f *.o fw fw.bin fw.dat
... ...
@@ -118,6 +118,7 @@
118 118
     <property xil_pn:name="Create Mask File" xil_pn:value="false" xil_pn:valueState="default"/>
119 119
     <property xil_pn:name="Create ReadBack Data Files" xil_pn:value="false" xil_pn:valueState="default"/>
120 120
     <property xil_pn:name="Cross Clock Analysis" xil_pn:value="false" xil_pn:valueState="default"/>
121
+    <property xil_pn:name="Custom Waveform Configuration File Behav" xil_pn:value="Default.wcfg" xil_pn:valueState="non-default"/>
121 122
     <property xil_pn:name="Decoder Extraction" xil_pn:value="true" xil_pn:valueState="default"/>
122 123
     <property xil_pn:name="Delay Values To Be Read from SDF" xil_pn:value="Setup Time" xil_pn:valueState="default"/>
123 124
     <property xil_pn:name="Device" xil_pn:value="xc3s700a" xil_pn:valueState="non-default"/>
... ...
@@ -343,7 +344,7 @@
343 344
     <property xil_pn:name="Use Custom Simulation Command File Map" xil_pn:value="false" xil_pn:valueState="default"/>
344 345
     <property xil_pn:name="Use Custom Simulation Command File Par" xil_pn:value="false" xil_pn:valueState="default"/>
345 346
     <property xil_pn:name="Use Custom Simulation Command File Translate" xil_pn:value="false" xil_pn:valueState="default"/>
346
-    <property xil_pn:name="Use Custom Waveform Configuration File Behav" xil_pn:value="false" xil_pn:valueState="default"/>
347
+    <property xil_pn:name="Use Custom Waveform Configuration File Behav" xil_pn:value="true" xil_pn:valueState="non-default"/>
347 348
     <property xil_pn:name="Use Custom Waveform Configuration File Map" xil_pn:value="false" xil_pn:valueState="default"/>
348 349
     <property xil_pn:name="Use Custom Waveform Configuration File Par" xil_pn:value="false" xil_pn:valueState="default"/>
349 350
     <property xil_pn:name="Use Custom Waveform Configuration File Translate" xil_pn:value="false" xil_pn:valueState="default"/>
... ...
@@ -45,7 +45,8 @@ BEGIN
45 45
         FILE     f_data:  text IS "fw/fw.dat";
46 46
         VARIABLE v_line:  line;
47 47
         VARIABLE v_addr:  integer;
48
-        VARIABLE v_data: integer;
48
+        VARIABLE v_data1: integer;
49
+        VARIABLE v_data2: integer;
49 50
     BEGIN
50 51
         s_rst        <= '0';
51 52
         s_clk        <= '0';
... ...
@@ -63,9 +64,11 @@ BEGIN
63 64
         v_addr   := 0;
64 65
         WHILE NOT endfile(f_data) LOOP
65 66
             readline(f_data, v_line);
66
-            read(v_line, v_data);
67
+            read(v_line, v_data1);
68
+            read(v_line, v_data2);
67 69
             s_prg_addr <= std_logic_vector(to_unsigned(v_addr, 32));
68
-            s_prg_data <= std_logic_vector(to_unsigned(v_data, 32));
70
+            s_prg_data <= std_logic_vector(to_unsigned(v_data2, 16)) &
71
+                          std_logic_vector(to_unsigned(v_data1, 16));
69 72
             WAIT FOR 1 ps;
70 73
             s_clk <= '1';
71 74
             WAIT FOR 1 ps;
72 75