OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • SSH
Fork

Scope: Commit

digital oscilloscope


Commit MetaInfo

Revision60856c9198665dab8a06907118296b0b46a0cc3d (tree)
Zeit2018-09-17 02:41:08
AutorPJ
CommiterPJ

Log Message

firmware/bulk/other.h: asm optimisation; firmware/.../Makefile: aligned

Ändern Zusammenfassung

Diff

diff -r 2df2b5e9776d -r 60856c919866 firmware/bulk/Makefile
--- a/firmware/bulk/Makefile Sun Sep 16 14:33:16 2018 +0100
+++ b/firmware/bulk/Makefile Sun Sep 16 18:41:08 2018 +0100
@@ -1,22 +1,25 @@
1-
2-COMMON = ../common
3-EZ_LOAD = ../../cli/ez_load
41
52 all: bulk_in.ihx
63
4+COMMON = ../common
5+FX2 = ../FX2
6+EZ_LOAD = ../../cli/ez_load
7+
78 include $(COMMON)/Makefile.common
89
9-INC = -I. -I$(COMMON) -I../FX2
10-VPATH = $(COMMON)
10+INC = -I. -I$(COMMON) -I$(FX2)
11+
12+VPATH = $(COMMON) $(FX2)
13+
1114 CFLAGS = $(ARCH) $(INC)
1215 LDFLAGS = $(ARCH) --code-size 0x1800 --xram-loc 0x1A00 --xram-size 0x80
1316 #--no-xinit-opt
1417
1518 bulk_in.ihx: bulk_in.rel setupdat.rel delay.rel int_jmp_tbl.rel descr.rel
16- $(CC) $(LDFLAGS) $^
19+ $(CC) $(LDFLAGS) $^ -o $@
1720
1821 bulk_in.load: bulk_in.bix
19- $(EZ_LOAD) $^ 08a9
22+ $(EZ_LOAD) $< 08a9
2023
2124 clean: clean_common
2225 $(RM) bulk_in.mem
diff -r 2df2b5e9776d -r 60856c919866 firmware/bulk/delay.c
--- a/firmware/bulk/delay.c Sun Sep 16 14:33:16 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
1-../FX2/delay.c
\ No newline at end of file
diff -r 2df2b5e9776d -r 60856c919866 firmware/bulk/other.h
--- a/firmware/bulk/other.h Sun Sep 16 14:33:16 2018 +0100
+++ b/firmware/bulk/other.h Sun Sep 16 18:41:08 2018 +0100
@@ -8,15 +8,16 @@
88 #define USE_GPIF_INTS() {EIEX4=1;\
99 INTSETUP|=bmAV4EN|INT4IN;}
1010
11-#define CLEAR_USBINT() EXIF &= ~EXIF_USBINT
12-#define CLEAR_GPIF() EXIF &= ~EXIF_GPIF
11+// note: cast to unsigned improves generated asm code
12+#define CLEAR_USBINT() EXIF &= ~(unsigned)EXIF_USBINT
13+//#define CLEAR_GPIF() EXIF &= ~EXIF_GPIF
1314
1415
1516 #define ENABLE_SOF() USBIE|=bmSOF
1617 #define CLEAR_SOF() CLEAR_USBINT(); USBIRQ=bmSOF
1718
18-#define ENABLE_SUSPEND() USBIE|=bmSUSP
19-#define CLEAR_SUSPEND() CLEAR_USBINT(); USBIRQ=bmSUSP
19+//#define ENABLE_SUSPEND() USBIE|=bmSUSP
20+//#define CLEAR_SUSPEND() CLEAR_USBINT(); USBIRQ=bmSUSP
2021
2122 #define CLEAR_USBRESET() CLEAR_USBINT(); USBIRQ=bmURES
2223
diff -r 2df2b5e9776d -r 60856c919866 firmware/iso/GPIF.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/firmware/iso/GPIF.h Sun Sep 16 18:41:08 2018 +0100
@@ -0,0 +1,1 @@
1+../bulk/GPIF.h
\ No newline at end of file
diff -r 2df2b5e9776d -r 60856c919866 firmware/iso/Makefile
--- a/firmware/iso/Makefile Sun Sep 16 14:33:16 2018 +0100
+++ b/firmware/iso/Makefile Sun Sep 16 18:41:08 2018 +0100
@@ -1,22 +1,25 @@
1-
2-COMMON = ../common
3-EZ_LOAD = ../../cli/ez_load
41
52 all: probe.ihx
63
4+COMMON = ../common
5+FX2 = ../FX2
6+EZ_LOAD = ../../cli/ez_load
7+
78 include $(COMMON)/Makefile.common
89
9-INC = -I. -I$(COMMON) -I../FX2
10-VPATH = $(COMMON)
10+INC = -I. -I$(COMMON) -I$(FX2)
11+
12+VPATH = $(COMMON) $(FX2)
13+
1114 CFLAGS = $(ARCH) $(INC)
1215 LDFLAGS = $(ARCH) --code-size 0x1800 --xram-loc 0x1A00 --xram-size 0x80
1316 #--no-xinit-opt
1417
1518 probe.ihx: probe.rel setupdat.rel delay.rel int_jmp_tbl.rel descr.rel
16- $(CC) $(LDFLAGS) $^
19+ $(CC) $(LDFLAGS) $^ -o $@
1720
1821 probe.load: probe.bix
19- $(EZ_LOAD) $^ 08a9
22+ $(EZ_LOAD) $< 08a9
2023
2124 clean: clean_common
2225 $(RM) probe.mem
diff -r 2df2b5e9776d -r 60856c919866 firmware/iso/other.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/firmware/iso/other.h Sun Sep 16 18:41:08 2018 +0100
@@ -0,0 +1,1 @@
1+../bulk/other.h
\ No newline at end of file
diff -r 2df2b5e9776d -r 60856c919866 firmware/iso/setupdat.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/firmware/iso/setupdat.c Sun Sep 16 18:41:08 2018 +0100
@@ -0,0 +1,1 @@
1+../bulk/setupdat.c
\ No newline at end of file
diff -r 2df2b5e9776d -r 60856c919866 firmware/iso/setupdat.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/firmware/iso/setupdat.h Sun Sep 16 18:41:08 2018 +0100
@@ -0,0 +1,1 @@
1+../bulk/setupdat.h
\ No newline at end of file
diff -r 2df2b5e9776d -r 60856c919866 firmware/test_in/Makefile
--- a/firmware/test_in/Makefile Sun Sep 16 14:33:16 2018 +0100
+++ b/firmware/test_in/Makefile Sun Sep 16 18:41:08 2018 +0100
@@ -4,6 +4,8 @@
44
55 COMMON = ../common
66 FX2 = ../FX2
7+EZ_LOAD = ../../cli/ez_load
8+
79 include $(COMMON)/Makefile.common
810
911 INC = -I. -I$(FX2)
@@ -18,7 +20,7 @@
1820 $(CC) $(LDFLAGS) $^ -o $@
1921
2022 test_in.load: test_in.bix
21- /home/u/devel/Scope/cli/ez_load $< 04b4
23+ $(EZ_LOAD) $< 04b4
2224
2325 clean: clean_common
2426 $(RM) test_in.mem
Show on old repository browser