URL
https://opencores.org/ocsvn/usb_fpga_1_11/usb_fpga_1_11/trunk
Subversion Repositories usb_fpga_1_11
Compare Revisions
- This comparison shows the changes necessary to convert path
/usb_fpga_1_11/trunk/examples/usb-fpga-1.15/1.15b
- from Rev 5 to Rev 6
- ↔ Reverse comparison
Rev 5 → Rev 6
/mmio/UCEcho.java
133,6 → 133,7
// upload the firmware if necessary |
if ( force || ! ztex.valid() || ! ztex.dev().productString().equals("ucecho example for UFM 1.15") ) { |
System.out.println("Firmware upload time: " + ztex.uploadFirmware( "ucecho.ihx", force ) + " ms"); |
force = true; |
} |
|
// upload the bitstream if necessary |
/mmio/ucecho.c
32,7 → 32,7
// this product string is also used for identification by the host software |
#define[PRODUCT_STRING]["memeory mapping example for UFM 1.15"] |
|
xdata BYTE run; |
__xdata BYTE run; |
|
#define[PRE_FPGA_RESET][PRE_FPGA_RESET |
run = 0; |
/intraffic/InTraffic.java
186,6 → 186,7
// upload the firmware if necessary |
if ( force || ! ztex.valid() || ! ztex.dev().productString().equals("intraffic example for UFM 1.15") ) { |
System.out.println("Firmware upload time: " + ztex.uploadFirmware( "intraffic.ihx", force ) + " ms"); |
force = true; |
} |
|
// upload the bitstream if necessary |
/ucecho/UCEcho.java
133,6 → 133,7
// upload the firmware if necessary |
if ( force || ! ztex.valid() || ! ztex.dev().productString().equals("ucecho example for UFM 1.15") ) { |
System.out.println("Firmware upload time: " + ztex.uploadFirmware( "ucecho.ihx", force ) + " ms"); |
force = true; |
} |
|
// upload the bitstream if necessary |
/ucecho/ucecho.c
32,7 → 32,7
// enables high speed FPGA configuration via EP4 |
ENABLE_HS_FPGA_CONF(4); |
|
xdata BYTE run; |
__xdata BYTE run; |
|
#define[PRE_FPGA_RESET][PRE_FPGA_RESET |
run = 0; |
/lightshow/avr/lightshow.ihx
1,45 → 1,44
:100000000C94FA000C941B010C941B010C941B0122 |
:100010000C941B010C941B010C941B010C941B01F0 |
:100020000C941B010C941B010C941B010C941B01E0 |
:100030000C941B010C941B010C941B010C941B01D0 |
:100040000C941B010C941B010C941B010C941B01C0 |
:100050000C941B010C941B010C941B010C941B01B0 |
:100060000C941B010C941B010C941B010C941B01A0 |
:100070000C941B010C941B010C941B010C941B0190 |
:100080000C941B010C941B010C941B010C941B0180 |
:100090000C941B010C941B010C941B010C941B0170 |
:1000A0000C941B010C941B010C941B010C941B0160 |
:1000B0000C941B010C941B010C941B010C941B0150 |
:1000C0000C941B010C941B010C941B010C941B0140 |
:1000D0000C941B010C941B010C941B010C941B0130 |
:1000E0000C941B010C941B010C941B010C941B0120 |
:1000F0000C941B010C941B010C941B010C941B0110 |
:100100000C941B010C941B010C941B010C941B01FF |
:100110000C941B010C941B010C941B010C941B01EF |
:100120000C941B010C941B010C941B010C941B01DF |
:100130000C941B010C941B010C941B010C941B01CF |
:100140000C941B010C941B010C941B010C941B01BF |
:100150000C941B010C941B010C941B010C941B01AF |
:100160000C941B010C941B010C941B010C941B019F |
:100170000C941B010C941B010C941B010C941B018F |
:100180000C941B010C941B010C941B010C941B017F |
:100190000C941B010C941B010C941B010C941B016F |
:1001A0000C941B010C941B010C941B010C941B015F |
:1001B0000C941B010C941B010C941B010C941B014F |
:1001C0000C941B010C941B010C941B010C941B013F |
:1001D0000C941B010C941B010C941B010C941B012F |
:1001E0000C941B010C941B010C941B010C941B011F |
:1001F0000C941B0111241FBECFEFDFE3DEBFCDBF88 |
:1002000000E00CBF10E2A0E0B0E2E2EBF2E000E0C0 |
:100210000BBF02C007900D92A030B107D9F710E2D2 |
:10022000A0E0B0E201C01D92A030B107E1F70E944A |
:100230001D010C9457010C94000088ED77E084BFF9 |
:10024000709350008091510087708730D9F788ED06 |
:1002500071E084BF7093600084BF7093680084BFB6 |
:100260007093400088ED71E084BF7093960082E047 |
:10027000E0EBF0E0848380E8809360061092000752 |
:100280001092E006809160068F60809360068FEF89 |
:100290008093A006A0E6B6E0E0EAF6E080910807C9 |
:1002A00014968C9314978091E8068483F7CFF89482 |
:0202B000FFCF7E |
:100000000C94FA000C9418010C9418010C9418012B |
:100010000C9418010C9418010C9418010C941801FC |
:100020000C9418010C9418010C9418010C941801EC |
:100030000C9418010C9418010C9418010C941801DC |
:100040000C9418010C9418010C9418010C941801CC |
:100050000C9418010C9418010C9418010C941801BC |
:100060000C9418010C9418010C9418010C941801AC |
:100070000C9418010C9418010C9418010C9418019C |
:100080000C9418010C9418010C9418010C9418018C |
:100090000C9418010C9418010C9418010C9418017C |
:1000A0000C9418010C9418010C9418010C9418016C |
:1000B0000C9418010C9418010C9418010C9418015C |
:1000C0000C9418010C9418010C9418010C9418014C |
:1000D0000C9418010C9418010C9418010C9418013C |
:1000E0000C9418010C9418010C9418010C9418012C |
:1000F0000C9418010C9418010C9418010C9418011C |
:100100000C9418010C9418010C9418010C9418010B |
:100110000C9418010C9418010C9418010C941801FB |
:100120000C9418010C9418010C9418010C941801EB |
:100130000C9418010C9418010C9418010C941801DB |
:100140000C9418010C9418010C9418010C941801CB |
:100150000C9418010C9418010C9418010C941801BB |
:100160000C9418010C9418010C9418010C941801AB |
:100170000C9418010C9418010C9418010C9418019B |
:100180000C9418010C9418010C9418010C9418018B |
:100190000C9418010C9418010C9418010C9418017B |
:1001A0000C9418010C9418010C9418010C9418016B |
:1001B0000C9418010C9418010C9418010C9418015B |
:1001C0000C9418010C9418010C9418010C9418014B |
:1001D0000C9418010C9418010C9418010C9418013B |
:1001E0000C9418010C9418010C9418010C9418012B |
:1001F0000C94180111241FBECFEFDFE3DEBFCDBF8B |
:1002000000E00CBF18BE19BE1ABE1BBE10E2A0E073 |
:10021000B0E2ECEAF2E000E00BBF02C007900D9202 |
:10022000A030B107D9F71BBE0E941A010C945401EB |
:100230000C94000088ED77E084BF709350008091AB |
:10024000510087708730D9F788ED71E084BF7093D3 |
:10025000600084BF7093680084BF7093400088ED95 |
:1002600071E084BF7093960082E0E0EBF0E084835D |
:1002700080E880936006109200071092E00680915B |
:1002800060068F60809360068FEF8093A006A0E6E3 |
:10029000B6E0E0EAF6E08091080714968C93149794 |
:0C02A0008091E8068483F7CFF894FFCF2C |
:00000001FF |
/lightshow/lightshow.c
19,7 → 19,7
#include[ztex-conf.h] // Loads the configuration macros, see ztex-conf.h for the available macros |
#include[ztex-utils.h] // include basic functions |
|
// Endpoint 2 is used to high spee FPGA configuration |
// Endpoint 2 is used to high speed FPGA configuration |
EP_CONFIG(2,0,BULK,OUT,512,4); |
|
// select ZTEX USB FPGA Module 1.15 + Experimental Board 1.10 as target |
/lightshow/Makefile
7,11 → 7,11
JARTARGET=Lightshow.jar |
CLASSTARGETS=Lightshow.class |
CLASSEXTRADEPS= |
#CLASSEXTRADEPS:=$(shell echo $(ZTEXPREFIX)/java/ztex/*.java) |
#CLASSEXTRADEPS:=$(wildcard $(ZTEXPREFIX)/java/ztex/*.java) |
|
IHXTARGETS=lightshow.ihx |
IHXEXTRADEPS= |
#IHXEXTRADEPS:=$(shell echo $(ZTEXPREFIX)/include/*.h) |
#IHXEXTRADEPS:=$(wildcard $(ZTEXPREFIX)/include/*.h) |
EXTRAJARFILES=lightshow.ihx avr/lightshow.ihx fpga/lightshow.bit |
|
################################ |
/Makefile
1,6 → 1,6
DIRS=ucecho intraffic memtest lightshow mmio |
|
.PHONY: default all clean distclean |
.PHONY: default all clean distclean avr avrclean avrdistclean |
|
default: |
@echo "This makefile is intended to clean up the project or to build all examples in this subdirectory" |
7,10 → 7,20
@echo "Usage: make all | clean | distclean" |
|
all: |
for i in $(DIRS); do make -C $$i all; done |
set -e; for i in $(DIRS); do make -C $$i all; done |
|
clean: |
for i in $(DIRS); do make -C $$i clean; done |
set -e; for i in $(DIRS); do make -C $$i clean; done |
|
distclean: clean |
for i in $(DIRS); do make -C $$i distclean; done |
distclean: |
set -e; for i in $(DIRS); do make -C $$i distclean; done |
|
avr: |
set -e; for i in $(DIRS); do make -C $$i avr; done |
|
avrclean: |
set -e; for i in $(DIRS); do make -C $$i avrclean; done |
|
avrdistclean: |
set -e; for i in $(DIRS); do make -C $$i avrdistclean; done |
|
/memtest/MemTest.java
187,6 → 187,7
// upload the firmware if necessary |
if ( force || ! ztex.valid() || ! ztex.dev().productString().equals("memtest example for UFM 1.15") ) { |
System.out.println("Firmware upload time: " + ztex.uploadFirmware( "memtest.ihx", force ) + " ms"); |
force = true; |
} |
|
ztex.vendorCommand (0x60, "Set test pattern", (genMode ? 1 : 0), 0); |