X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/715d74c5be4215d57f3d9d6e874018a959d022c9..254b70a4afb07e6ec0f8b1b300df488337bbebc3:/armsrc/appmain.c?ds=inline diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 9a692128..b107f594 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -1,25 +1,39 @@ //----------------------------------------------------------------------------- -// The main application code. This is the first thing called after start.c -// executes. // Jonathan Westhues, Mar 2006 // Edits by Gerhard de Koning Gans, Sep 2007 (##) +// +// This code is licensed to you under the terms of the GNU GPL, version 2 or, +// at your option, any later version. See the LICENSE.txt file for the text of +// the license. +//----------------------------------------------------------------------------- +// The main application code. This is the first thing called after start.c +// executes. //----------------------------------------------------------------------------- -#include -#include +#include "proxmark3.h" #include "apps.h" +#include "util.h" +#include "printf.h" +#include "string.h" + +#include + +#include "legicrf.h" + #ifdef WITH_LCD -#include "fonts.h" -#include "LCD.h" +# include "fonts.h" +# include "LCD.h" #endif +#define abs(x) ( ((x)<0) ? -(x) : (x) ) + //============================================================================= // A buffer where we can queue things up to be sent through the FPGA, for // any purpose (fake tag, as reader, whatever). We go MSB first, since that // is the order in which they go out on the wire. //============================================================================= -BYTE ToSend[256]; +uint8_t ToSend[512]; int ToSendMax; static int ToSendBit; struct common_area common_area __attribute__((section(".commonarea"))); @@ -27,7 +41,7 @@ struct common_area common_area __attribute__((section(".commonarea"))); void BufferClear(void) { memset(BigBuf,0,sizeof(BigBuf)); - DbpString("Buffer cleared"); + Dbprintf("Buffer cleared (%i bytes)",sizeof(BigBuf)); } void ToSendReset(void) @@ -68,14 +82,18 @@ void DbpString(char *str) UsbCommand c; c.cmd = CMD_DEBUG_PRINT_STRING; - c.ext1 = strlen(str); - memcpy(c.d.asBytes, str, c.ext1); + c.arg[0] = strlen(str); + if(c.arg[0] > sizeof(c.d.asBytes)) { + c.arg[0] = sizeof(c.d.asBytes); + } + memcpy(c.d.asBytes, str, c.arg[0]); - UsbSendPacket((BYTE *)&c, sizeof(c)); + UsbSendPacket((uint8_t *)&c, sizeof(c)); // TODO fix USB so stupid things like this aren't req'd SpinDelay(50); } +#if 0 void DbpIntegers(int x1, int x2, int x3) { /* this holds up stuff unless we're connected to usb */ @@ -84,14 +102,50 @@ void DbpIntegers(int x1, int x2, int x3) UsbCommand c; c.cmd = CMD_DEBUG_PRINT_INTEGERS; - c.ext1 = x1; - c.ext2 = x2; - c.ext3 = x3; + c.arg[0] = x1; + c.arg[1] = x2; + c.arg[2] = x3; - UsbSendPacket((BYTE *)&c, sizeof(c)); + UsbSendPacket((uint8_t *)&c, sizeof(c)); // XXX SpinDelay(50); } +#endif + +void Dbprintf(const char *fmt, ...) { +// should probably limit size here; oh well, let's just use a big buffer + char output_string[128]; + va_list ap; + + va_start(ap, fmt); + kvsprintf(fmt, output_string, 10, ap); + va_end(ap); + + DbpString(output_string); +} + +// prints HEX & ASCII +void Dbhexdump(int len, uint8_t *d) { + int l=0,i; + char ascii[9]; + + while (len>0) { + if (len>8) l=8; + else l=len; + + memcpy(ascii,d,l); + ascii[l]=0; + + // filter safe ascii + for (i=0;i126) ascii[i]='.'; + + Dbprintf("%-8s %*D",ascii,l,d," "); + + len-=8; + d+=8; + } +} //----------------------------------------------------------------------------- // Read an ADC channel and block till it completes, then return the result @@ -100,22 +154,24 @@ void DbpIntegers(int x1, int x2, int x3) //----------------------------------------------------------------------------- static int ReadAdc(int ch) { - DWORD d; + uint32_t d; - ADC_CONTROL = ADC_CONTROL_RESET; - ADC_MODE = ADC_MODE_PRESCALE(32) | ADC_MODE_STARTUP_TIME(16) | + AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST; + AT91C_BASE_ADC->ADC_MR = + ADC_MODE_PRESCALE(32) | + ADC_MODE_STARTUP_TIME(16) | ADC_MODE_SAMPLE_HOLD_TIME(8); - ADC_CHANNEL_ENABLE = ADC_CHANNEL(ch); + AT91C_BASE_ADC->ADC_CHER = ADC_CHANNEL(ch); - ADC_CONTROL = ADC_CONTROL_START; - while(!(ADC_STATUS & ADC_END_OF_CONVERSION(ch))) + AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START; + while(!(AT91C_BASE_ADC->ADC_SR & ADC_END_OF_CONVERSION(ch))) ; - d = ADC_CHANNEL_DATA(ch); + d = AT91C_BASE_ADC->ADC_CDR[ch]; return d; } -static int AvgAdc(int ch) +int AvgAdc(int ch) // was static - merlok { int i; int a = 0; @@ -129,8 +185,8 @@ static int AvgAdc(int ch) void MeasureAntennaTuning(void) { - BYTE *dest = (BYTE *)BigBuf; - int i, ptr = 0, adcval = 0, peak = 0, peakv = 0, peakf = 0;; + uint8_t *dest = (uint8_t *)BigBuf; + int i, adcval = 0, peak = 0, peakv = 0, peakf = 0; //ptr = 0 int vLf125 = 0, vLf134 = 0, vHf = 0; // in mV UsbCommand c; @@ -161,7 +217,7 @@ void MeasureAntennaTuning(void) peakv = adcval; peak = dest[i]; peakf = i; - ptr = i; + //ptr = i; } } @@ -173,17 +229,38 @@ void MeasureAntennaTuning(void) vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10; c.cmd = CMD_MEASURED_ANTENNA_TUNING; - c.ext1 = (vLf125 << 0) | (vLf134 << 16); - c.ext2 = vHf; - c.ext3 = peakf | (peakv << 16); - UsbSendPacket((BYTE *)&c, sizeof(c)); + c.arg[0] = (vLf125 << 0) | (vLf134 << 16); + c.arg[1] = vHf; + c.arg[2] = peakf | (peakv << 16); + UsbSendPacket((uint8_t *)&c, sizeof(c)); +} + +void MeasureAntennaTuningHf(void) +{ + int vHf = 0; // in mV + + DbpString("Measuring HF antenna, press button to exit"); + + for (;;) { + // Let the FPGA drive the high-frequency antenna around 13.56 MHz. + FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR); + SpinDelay(20); + // Vref = 3300mV, and an 10:1 voltage divider on the input + // can measure voltages up to 33000 mV + vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10; + + Dbprintf("%d mV",vHf); + if (BUTTON_PRESS()) break; + } + DbpString("cancelled"); } + void SimulateTagHfListen(void) { - BYTE *dest = (BYTE *)BigBuf; + uint8_t *dest = (uint8_t *)BigBuf; int n = sizeof(BigBuf); - BYTE v = 0; + uint8_t v = 0; int i; int p = 0; @@ -198,11 +275,11 @@ void SimulateTagHfListen(void) i = 0; for(;;) { - if(SSC_STATUS & (SSC_STATUS_TX_READY)) { - SSC_TRANSMIT_HOLDING = 0xff; + if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { + AT91C_BASE_SSC->SSC_THR = 0xff; } - if(SSC_STATUS & (SSC_STATUS_RX_READY)) { - BYTE r = (BYTE)SSC_RECEIVE_HOLDING; + if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { + uint8_t r = (uint8_t)AT91C_BASE_SSC->SSC_RHR; v <<= 1; if(r & 1) { @@ -227,13 +304,10 @@ void SimulateTagHfListen(void) void ReadMem(int addr) { - const DWORD *data = ((DWORD *)addr); - int i; + const uint8_t *data = ((uint8_t *)addr); - DbpString("Reading memory at address"); - DbpIntegers(0, 0, addr); - for (i = 0; i < 8; i+= 2) - DbpIntegers(0, data[i], data[i+1]); + Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x", + addr, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]); } /* osimage version information is linked in */ @@ -244,8 +318,8 @@ void SendVersion(void) { char temp[48]; /* Limited data payload in USB packets */ DbpString("Prox/RFID mark3 RFID instrument"); - - /* Try to find the bootrom version information. Expect to find a pointer at + + /* Try to find the bootrom version information. Expect to find a pointer at * symbol _bootphase1_version_pointer, perform slight sanity checks on the * pointer, then use it. */ @@ -256,14 +330,15 @@ void SendVersion(void) FormatVersionInformation(temp, sizeof(temp), "bootrom: ", bootrom_version); DbpString(temp); } - + FormatVersionInformation(temp, sizeof(temp), "os: ", &version_information); DbpString(temp); - + FpgaGatherVersion(temp, sizeof(temp)); DbpString(temp); } +#ifdef WITH_LF // samy's sniff and repeat routine void SamyRun() { @@ -318,8 +393,7 @@ void SamyRun() SpinDelay(500); CmdHIDdemodFSK(1, &high[selected], &low[selected], 0); - DbpString("Recorded"); - DbpIntegers(selected, high[selected], low[selected]); + Dbprintf("Recorded %x %x %x", selected, high[selected], low[selected]); LEDsoff(); LED(selected + 1, 0); @@ -349,7 +423,7 @@ void SamyRun() // wait for button to be released while(BUTTON_PRESS()) WDT_HIT(); - DbpIntegers(selected, high[selected], low[selected]); + Dbprintf("%x %x %x", selected, high[selected], low[selected]); CmdHIDsimTAG(high[selected], low[selected], 0); DbpString("Done playing"); if (BUTTON_HELD(1000) > 0) @@ -374,7 +448,7 @@ void SamyRun() } } } - +#endif /* OBJECTIVE @@ -427,17 +501,15 @@ void ListenReaderField(int limit) lf_av=lf_max=ReadAdc(ADC_CHAN_LF); if(limit != HF_ONLY) { - DbpString("LF 125/134 Baseline:"); - DbpIntegers(lf_av,0,0); - lf_baseline= lf_av; + Dbprintf("LF 125/134 Baseline: %d", lf_av); + lf_baseline = lf_av; } hf_av=hf_max=ReadAdc(ADC_CHAN_HF); if (limit != LF_ONLY) { - DbpString("HF 13.56 Baseline:"); - DbpIntegers(hf_av,0,0); - hf_baseline= hf_av; + Dbprintf("HF 13.56 Baseline: %d", hf_av); + hf_baseline = hf_av; } for(;;) { @@ -463,14 +535,13 @@ void ListenReaderField(int limit) if (abs(lf_av - lf_baseline) > 10) LED_D_ON(); else LED_D_OFF(); } - + ++lf_count; lf_av_new= ReadAdc(ADC_CHAN_LF); // see if there's a significant change if(abs(lf_av - lf_av_new) > 10) { - DbpString("LF 125/134 Field Change:"); - DbpIntegers(lf_av,lf_av_new,lf_count); - lf_av= lf_av_new; + Dbprintf("LF 125/134 Field Change: %x %x %x", lf_av, lf_av_new, lf_count); + lf_av = lf_av_new; if (lf_av > lf_max) lf_max = lf_av; lf_count= 0; @@ -482,20 +553,19 @@ void ListenReaderField(int limit) if (abs(hf_av - hf_baseline) > 10) LED_B_ON(); else LED_B_OFF(); } - + ++hf_count; hf_av_new= ReadAdc(ADC_CHAN_HF); // see if there's a significant change if(abs(hf_av - hf_av_new) > 10) { - DbpString("HF 13.56 Field Change:"); - DbpIntegers(hf_av,hf_av_new,hf_count); - hf_av= hf_av_new; + Dbprintf("HF 13.56 Field Change: %x %x %x", hf_av, hf_av_new, hf_count); + hf_av = hf_av_new; if (hf_av > hf_max) hf_max = hf_av; hf_count= 0; } } - + if(mode == 2) { if (limit == LF_ONLY) { display_val = lf_av; @@ -525,81 +595,191 @@ void ListenReaderField(int limit) } } -void UsbPacketReceived(BYTE *packet, int len) +void UsbPacketReceived(uint8_t *packet, int len) { UsbCommand *c = (UsbCommand *)packet; + UsbCommand ack; + ack.cmd = CMD_ACK; switch(c->cmd) { +#ifdef WITH_LF case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K: - AcquireRawAdcSamples125k(c->ext1); + AcquireRawAdcSamples125k(c->arg[0]); + UsbSendPacket((uint8_t*)&ack, sizeof(ack)); break; - case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K: - ModThenAcquireRawAdcSamples125k(c->ext1,c->ext2,c->ext3,c->d.asBytes); + ModThenAcquireRawAdcSamples125k(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes); + break; + case CMD_HID_DEMOD_FSK: + CmdHIDdemodFSK(0, 0, 0, 1); // Demodulate HID tag + break; + case CMD_HID_SIM_TAG: + CmdHIDsimTAG(c->arg[0], c->arg[1], 1); // Simulate HID tag by ID + break; + case CMD_HID_CLONE_TAG: + CopyHIDtoT5567(c->arg[0], c->arg[1]); // Clone HID tag by ID to T55x7 + break; + case CMD_EM410X_WRITE_TAG: + WriteEM410x(c->arg[0], c->arg[1], c->arg[2]); + break; + case CMD_READ_TI_TYPE: + ReadTItag(); + break; + case CMD_WRITE_TI_TYPE: + WriteTItag(c->arg[0],c->arg[1],c->arg[2]); break; + case CMD_SIMULATE_TAG_125K: + LED_A_ON(); + SimulateTagLowFrequency(c->arg[0], c->arg[1], 1); + LED_A_OFF(); + break; + case CMD_LF_SIMULATE_BIDIR: + SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]); + break; +#endif +#ifdef WITH_ISO15693 case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693: AcquireRawAdcSamplesIso15693(); break; - - case CMD_BUFF_CLEAR: - BufferClear(); + case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693: + RecordRawAdcSamplesIso15693(); + break; + + case CMD_ISO_15693_COMMAND: + DirectTag15693Command(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes); + break; + + case CMD_ISO_15693_FIND_AFI: + BruteforceIso15693Afi(c->arg[0]); + break; + + case CMD_ISO_15693_DEBUG: + SetDebugIso15693(c->arg[0]); break; case CMD_READER_ISO_15693: - ReaderIso15693(c->ext1); + ReaderIso15693(c->arg[0]); break; - case CMD_SIMTAG_ISO_15693: - SimTagIso15693(c->ext1); + SimTagIso15693(c->arg[0]); break; +#endif - case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443: - AcquireRawAdcSamplesIso14443(c->ext1); +#ifdef WITH_LEGICRF + case CMD_SIMULATE_TAG_LEGIC_RF: + LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]); break; - case CMD_READ_SRI512_TAG: - ReadSRI512Iso14443(c->ext1); + case CMD_WRITER_LEGIC_RF: + LegicRfWriter(c->arg[1], c->arg[0]); break; - case CMD_READER_ISO_14443a: - ReaderIso14443a(c->ext1); + case CMD_READER_LEGIC_RF: + LegicRfReader(c->arg[0], c->arg[1]); break; +#endif +#ifdef WITH_ISO14443b + case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443: + AcquireRawAdcSamplesIso14443(c->arg[0]); + break; + case CMD_READ_SRI512_TAG: + ReadSRI512Iso14443(c->arg[0]); + break; + case CMD_READ_SRIX4K_TAG: + ReadSRIX4KIso14443(c->arg[0]); + break; case CMD_SNOOP_ISO_14443: SnoopIso14443(); break; + case CMD_SIMULATE_TAG_ISO_14443: + SimulateIso14443Tag(); + break; +#endif +#ifdef WITH_ISO14443a case CMD_SNOOP_ISO_14443a: SnoopIso14443a(); break; + case CMD_READER_ISO_14443a: + ReaderIso14443a(c, &ack); + break; + case CMD_SIMULATE_TAG_ISO_14443a: + SimulateIso14443aTag(c->arg[0], c->arg[1], c->arg[2]); // ## Simulate iso14443a tag - pass tag type & UID + break; + + case CMD_READER_MIFARE: + ReaderMifare(c->arg[0]); + break; + case CMD_MIFARE_READBL: + MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); + break; + case CMD_MIFARE_READSC: + MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); + break; + case CMD_MIFARE_WRITEBL: + MifareWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); + break; + case CMD_MIFARE_NESTED: + MifareNested(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); + break; + case CMD_MIFARE_CHKKEYS: + MifareChkKeys(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); + break; + case CMD_SIMULATE_MIFARE_CARD: + Mifare1ksim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); + break; + + // emulator + case CMD_MIFARE_SET_DBGMODE: + MifareSetDbgLvl(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); + break; + case CMD_MIFARE_EML_MEMCLR: + MifareEMemClr(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); + break; + case CMD_MIFARE_EML_MEMSET: + MifareEMemSet(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); + break; + case CMD_MIFARE_EML_MEMGET: + MifareEMemGet(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); + break; + case CMD_MIFARE_EML_CARDLOAD: + MifareECardLoad(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); + break; +#endif - case CMD_SIMULATE_TAG_HF_LISTEN: - SimulateTagHfListen(); +#ifdef WITH_ICLASS + // Makes use of ISO14443a FPGA Firmware + case CMD_SNOOP_ICLASS: + SnoopIClass(); break; + case CMD_SIMULATE_TAG_ICLASS: + SimulateIClass(c->arg[0], c->d.asBytes); + break; + case CMD_READER_ICLASS: + ReaderIClass(c->arg[0]); + break; +#endif - case CMD_SIMULATE_TAG_ISO_14443: - SimulateIso14443Tag(); + case CMD_SIMULATE_TAG_HF_LISTEN: + SimulateTagHfListen(); break; - case CMD_SIMULATE_TAG_ISO_14443a: - SimulateIso14443aTag(c->ext1, c->ext2); // ## Simulate iso14443a tag - pass tag type & UID + case CMD_BUFF_CLEAR: + BufferClear(); break; case CMD_MEASURE_ANTENNA_TUNING: MeasureAntennaTuning(); break; - case CMD_LISTEN_READER_FIELD: - ListenReaderField(c->ext1); - break; - - case CMD_HID_DEMOD_FSK: - CmdHIDdemodFSK(0, 0, 0, 1); // Demodulate HID tag + case CMD_MEASURE_ANTENNA_TUNING_HF: + MeasureAntennaTuningHf(); break; - case CMD_HID_SIM_TAG: - CmdHIDsimTAG(c->ext1, c->ext2, 1); // Simulate HID tag by ID + case CMD_LISTEN_READER_FIELD: + ListenReaderField(c->arg[0]); break; case CMD_FPGA_MAJOR_MODE_OFF: // ## FPGA Control @@ -608,14 +788,6 @@ void UsbPacketReceived(BYTE *packet, int len) LED_D_OFF(); // LED D indicates field ON or OFF break; - case CMD_READ_TI_TYPE: - ReadTItag(); - break; - - case CMD_WRITE_TI_TYPE: - WriteTItag(c->ext1,c->ext2,c->ext3); - break; - case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: { UsbCommand n; if(c->cmd == CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K) { @@ -623,39 +795,53 @@ void UsbPacketReceived(BYTE *packet, int len) } else { n.cmd = CMD_DOWNLOADED_RAW_BITS_TI_TYPE; } - n.ext1 = c->ext1; - memcpy(n.d.asDwords, BigBuf+c->ext1, 12*sizeof(DWORD)); - UsbSendPacket((BYTE *)&n, sizeof(n)); + n.arg[0] = c->arg[0]; + memcpy(n.d.asDwords, BigBuf+c->arg[0], 12*sizeof(uint32_t)); + LED_B_ON(); + UsbSendPacket((uint8_t *)&n, sizeof(n)); + LED_B_OFF(); break; } + case CMD_DOWNLOADED_SIM_SAMPLES_125K: { - BYTE *b = (BYTE *)BigBuf; - memcpy(b+c->ext1, c->d.asBytes, 48); + uint8_t *b = (uint8_t *)BigBuf; + memcpy(b+c->arg[0], c->d.asBytes, 48); + //Dbprintf("copied 48 bytes to %i",b+c->arg[0]); + UsbSendPacket((uint8_t*)&ack, sizeof(ack)); break; } - case CMD_SIMULATE_TAG_125K: - LED_A_ON(); - SimulateTagLowFrequency(c->ext1, 1); - LED_A_OFF(); - break; + case CMD_READ_MEM: - ReadMem(c->ext1); + ReadMem(c->arg[0]); break; + case CMD_SET_LF_DIVISOR: - FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->ext1); + FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->arg[0]); break; + + case CMD_SET_ADC_MUX: + switch(c->arg[0]) { + case 0: SetAdcMuxFor(GPIO_MUXSEL_LOPKD); break; + case 1: SetAdcMuxFor(GPIO_MUXSEL_LORAW); break; + case 2: SetAdcMuxFor(GPIO_MUXSEL_HIPKD); break; + case 3: SetAdcMuxFor(GPIO_MUXSEL_HIRAW); break; + } + break; + case CMD_VERSION: SendVersion(); break; - case CMD_LF_SIMULATE_BIDIR: - SimulateTagLowFrequencyBidir(c->ext1, c->ext2); - break; + +#ifdef WITH_LF + +#endif + #ifdef WITH_LCD case CMD_LCD_RESET: LCDReset(); break; case CMD_LCD: - LCDSend(c->ext1); + LCDSend(c->arg[0]); break; #endif case CMD_SETUP_WRITE: @@ -664,39 +850,39 @@ void UsbPacketReceived(BYTE *packet, int len) USB_D_PLUS_PULLUP_OFF(); SpinDelay(1000); SpinDelay(1000); - RSTC_CONTROL = RST_CONTROL_KEY | RST_CONTROL_PROCESSOR_RESET; + AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST; for(;;) { // We're going to reset, and the bootrom will take control. } break; + case CMD_START_FLASH: if(common_area.flags.bootrom_present) { common_area.command = COMMON_AREA_COMMAND_ENTER_FLASH_MODE; } USB_D_PLUS_PULLUP_OFF(); - RSTC_CONTROL = RST_CONTROL_KEY | RST_CONTROL_PROCESSOR_RESET; + AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST; for(;;); break; - + case CMD_DEVICE_INFO: { UsbCommand c; c.cmd = CMD_DEVICE_INFO; - c.ext1 = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS; - if(common_area.flags.bootrom_present) c.ext1 |= DEVICE_INFO_FLAG_BOOTROM_PRESENT; - UsbSendPacket((BYTE*)&c, sizeof(c)); + c.arg[0] = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS; + if(common_area.flags.bootrom_present) c.arg[0] |= DEVICE_INFO_FLAG_BOOTROM_PRESENT; + UsbSendPacket((uint8_t*)&c, sizeof(c)); } break; default: - DbpString("unknown command"); + Dbprintf("%s: 0x%04x","unknown command:",c->cmd); break; } } -void AppMain(void) +void __attribute__((noreturn)) AppMain(void) { - memset(BigBuf,0,sizeof(BigBuf)); SpinDelay(100); - + if(common_area.magic != COMMON_AREA_MAGIC || common_area.version != 1) { /* Initialize common area */ memset(&common_area, 0, sizeof(common_area)); @@ -713,22 +899,24 @@ void AppMain(void) UsbStart(); // The FPGA gets its clock from us from PCK0 output, so set that up. - PIO_PERIPHERAL_B_SEL = (1 << GPIO_PCK0); - PIO_DISABLE = (1 << GPIO_PCK0); - PMC_SYS_CLK_ENABLE = PMC_SYS_CLK_PROGRAMMABLE_CLK_0; + AT91C_BASE_PIOA->PIO_BSR = GPIO_PCK0; + AT91C_BASE_PIOA->PIO_PDR = GPIO_PCK0; + AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_PCK0; // PCK0 is PLL clock / 4 = 96Mhz / 4 = 24Mhz - PMC_PROGRAMMABLE_CLK_0 = PMC_CLK_SELECTION_PLL_CLOCK | - PMC_CLK_PRESCALE_DIV_4; - PIO_OUTPUT_ENABLE = (1 << GPIO_PCK0); + AT91C_BASE_PMC->PMC_PCKR[0] = AT91C_PMC_CSS_PLL_CLK | + AT91C_PMC_PRES_CLK_4; + AT91C_BASE_PIOA->PIO_OER = GPIO_PCK0; // Reset SPI - SPI_CONTROL = SPI_CONTROL_RESET; + AT91C_BASE_SPI->SPI_CR = AT91C_SPI_SWRST; // Reset SSC - SSC_CONTROL = SSC_CONTROL_RESET; + AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST; // Load the FPGA image, which we have stored in our flash. FpgaDownloadAndGo(); + StartTickCount(); + #ifdef WITH_LCD LCDInit(); @@ -759,7 +947,9 @@ void AppMain(void) UsbPoll(FALSE); WDT_HIT(); +#ifdef WITH_LF if (BUTTON_HELD(1000) > 0) SamyRun(); +#endif } }