Reduced the size of BigBuf to make more room for stack/vars

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 1c73054adc38df69aa5ae23cee33129d5bae2d32..8ad442f1aca4caa708380d296bbde16d4caa2dee 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -37,12 +37,12 @@ all: osimage.s19
 \r
 $(OBJDIR)/fpgaimage.s19: $(OBJDIR)/fpgaimg.o\r
        @echo obj/fpgaimage.s19\r
 \r
 $(OBJDIR)/fpgaimage.s19: $(OBJDIR)/fpgaimg.o\r
        @echo obj/fpgaimage.s19\r

-       @$(LD) -g -Tldscript-fpga -o $(OBJDIR)\fpgaimage.elf $(OBJDIR)/fpgaimg.o\r
+       @$(LD) -g -Tldscript-fpga -o $(OBJDIR)\fpgaimage.elf -Map=obj/fpgaimage.map $(OBJDIR)/fpgaimg.o\r

        @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\fpgaimage.elf $(OBJDIR)\fpgaimage.s19\r
 \r
 $(OBJDIR)/osimage.s19: $(OBJ) $(OBJCOMMON)\r
        @echo obj/osimage.s19\r
        @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\fpgaimage.elf $(OBJDIR)\fpgaimage.s19\r
 \r
 $(OBJDIR)/osimage.s19: $(OBJ) $(OBJCOMMON)\r
        @echo obj/osimage.s19\r

-       @$(LD) -g -Tldscript -o $(OBJDIR)\osimage.elf $(OBJ) $(OBJCOMMON) $(LIB)\libgcc.a\r
+       @$(LD) -g -Tldscript -o $(OBJDIR)\osimage.elf $(OBJ) $(OBJCOMMON) -Map=obj/osimage.map $(LIB)\libgcc.a\r

        @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\osimage.elf $(OBJDIR)\osimage.s19\r
 \r
 osimage.s19: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19\r
        @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\osimage.elf $(OBJDIR)\osimage.s19\r
 \r
 osimage.s19: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19\r

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 11084ad7d00be26e4f7364037d9cf9cb3ae0fdd5..af6006e7ff4da0ef64d033d86bf3ef18d37b409f 100644 (file)
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -9,7 +9,7 @@
 \r
 // The large multi-purpose buffer, typically used to hold A/D samples,\r
 // maybe processed in some way.\r
 \r
 // The large multi-purpose buffer, typically used to hold A/D samples,\r
 // maybe processed in some way.\r

-DWORD BigBuf[16000];\r
+DWORD BigBuf[10000];\r

 \r
 /// appmain.h\r
 void ReadMem(int addr);\r
 \r
 /// appmain.h\r
 void ReadMem(int addr);\r

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 9fe60de81cbd7ec02bcf49f2584ff8d14c3c4d2a..6ac4e7251c97df16fb85bd71c2c189583686e787 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -123,6 +123,7 @@ void AcquireTiType(void)
        int n = 1250;\r
 \r
        // clear buffer\r
        int n = 1250;\r
 \r
        // clear buffer\r

+       DbpIntegers((DWORD)BigBuf, sizeof(BigBuf), 0x12345678);\r

        memset(BigBuf,0,sizeof(BigBuf));\r
 \r
        // Set up the synchronous serial port\r
        memset(BigBuf,0,sizeof(BigBuf));\r
 \r
        // Set up the synchronous serial port\r


@@ -218,17 +219,6 @@ void AcquireRawBitsTI(void)
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
 }\r
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
 }\r
 \r

-// this is a dummy function to get around\r
-// a possible flash bug in the bootloader\r
-// delete once you've added more code.\r
-void DummyDummyDummy(void)\r
-{\r
-       FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU);\r
-       AcquireTiType();\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-}\r
-\r

 // arguments: 64bit data split into 32bit idhi:idlo and optional 16bit crc\r
 // if crc provided, it will be written with the data verbatim (even if bogus)\r
 // if not provided a valid crc will be computed from the data and written.\r
 // arguments: 64bit data split into 32bit idhi:idlo and optional 16bit crc\r
 // if crc provided, it will be written with the data verbatim (even if bogus)\r
 // if not provided a valid crc will be computed from the data and written.\r

diff --git a/bootrom/Makefile b/bootrom/Makefile
index e18737c3d0b269be150a3911c46b37f9cd036c26..7a61cadb88ec265c17482e2f1b1937f5ab06a820 100644 (file)
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -24,12 +24,12 @@ bootrom.s19: $(OBJDIR)/bootrom.s19 $(OBJDIR)/bootrom-forjtag.s19
 \r
 $(OBJDIR)/bootrom.s19: $(OBJFLASH)\r
     @echo obj/bootrom.s19\r
 \r
 $(OBJDIR)/bootrom.s19: $(OBJFLASH)\r
     @echo obj/bootrom.s19\r

-       @$(LD) -g -Tldscript-flash --oformat elf32-littlearm -o $(OBJDIR)/bootrom.elf $(OBJFLASH)\r
+       @$(LD) -g -Tldscript-flash --oformat elf32-littlearm -Map=obj/bootrom.map -o $(OBJDIR)/bootrom.elf $(OBJFLASH)\r

        @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/bootrom.elf $(OBJDIR)/bootrom.s19\r
 \r
 $(OBJDIR)/bootrom-forjtag.s19: $(OBJJTAG)\r
     @echo obj/bootrom-forjtag.s19\r
        @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/bootrom.elf $(OBJDIR)/bootrom.s19\r
 \r
 $(OBJDIR)/bootrom-forjtag.s19: $(OBJJTAG)\r
     @echo obj/bootrom-forjtag.s19\r

-       @$(LD) -g -Tldscript-ram-jtag --oformat elf32-littlearm -o $(OBJDIR)/bootrom-forjtag.elf $(OBJJTAG)\r
+       @$(LD) -g -Tldscript-ram-jtag --oformat elf32-littlearm -Map=obj/bootrom-forjtag.map -o $(OBJDIR)/bootrom-forjtag.elf $(OBJJTAG)\r

        @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/bootrom-forjtag.elf $(OBJDIR)/bootrom-forjtag.s19\r
 \r
 $(OBJDIR)/bootrom.o: bootrom.c $(INCLUDES)\r
        @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/bootrom-forjtag.elf $(OBJDIR)/bootrom-forjtag.s19\r
 \r
 $(OBJDIR)/bootrom.o: bootrom.c $(INCLUDES)\r

diff --git a/winsrc/prox.cpp b/winsrc/prox.cpp
index e2c0a79cb38ce8cb7ef0a6fe8993d53f5cc893af..bbc9adbda78cf66beb5a0a3319b324b43b66152d 100644 (file)
--- a/winsrc/prox.cpp
+++ b/winsrc/prox.cpp
@@ -194,6 +194,7 @@ void SendCommand(UsbCommand *c, BOOL wantAck)
 \r
        DWORD written;\r
        OVERLAPPED ov;\r
 \r
        DWORD written;\r
        OVERLAPPED ov;\r

+\r

        memset(&ov, 0, sizeof(ov));\r
        WriteFile(UsbHandle, buf, 65, &written, &ov);\r
        if(GetLastError() != ERROR_IO_PENDING) {\r
        memset(&ov, 0, sizeof(ov));\r
        WriteFile(UsbHandle, buf, 65, &written, &ov);\r
        if(GetLastError() != ERROR_IO_PENDING) {\r


@@ -229,8 +230,6 @@ static void FlushPrevious(void)
        UsbCommand c;\r
        memset(&c, 0, sizeof(c));\r
 \r
        UsbCommand c;\r
        memset(&c, 0, sizeof(c));\r
 \r

-       printf("expected = %08x flush, ", ExpectedAddr);\r
-\r

        int i;\r
        for(i = 0; i < 240; i += 48) {\r
                c.cmd = CMD_SETUP_WRITE;\r
        int i;\r
        for(i = 0; i < 240; i += 48) {\r
                c.cmd = CMD_SETUP_WRITE;\r


@@ -241,7 +240,7 @@ static void FlushPrevious(void)
 \r
        c.cmd = CMD_FINISH_WRITE;\r
        c.ext1 = (ExpectedAddr-1) & (~255);\r
 \r
        c.cmd = CMD_FINISH_WRITE;\r
        c.ext1 = (ExpectedAddr-1) & (~255);\r

-       printf("c.ext1 = %08x\r", c.ext1);\r
+       printf("Flashing address: %08x\r", c.ext1);\r

        memcpy(c.d.asBytes, QueuedToSend+240, 16);\r
        SendCommand(&c, TRUE);\r
 \r
        memcpy(c.d.asBytes, QueuedToSend+240, 16);\r
        SendCommand(&c, TRUE);\r
 \r