diff --git a/Arduino/CCLoader/CCLoader.ino b/Arduino/CCLoader/CCLoader.ino index 1668f02..c9cfc66 100644 --- a/Arduino/CCLoader/CCLoader.ino +++ b/Arduino/CCLoader/CCLoader.ino @@ -79,7 +79,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI #define SDATA 0x02 #define SRSP 0x03 #define SEND 0x04 -#define ERRO 0x05 +#define ERRO 0x05 +#define CHIP_ID 0x11 +#define SDUMP 0x12 +#define FBLOCK 0x13 + #define WAITING 0x00 #define RECEIVING 0x01 @@ -87,7 +91,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI int DD = 6; int DC = 5; int RESET = 4; -int LED = 13; +int LED = LED_BUILTIN; /****************************************************************************** VARIABLES*/ @@ -258,9 +262,10 @@ void debug_init(void) * GET_CHIP_ID command. * @return Returns the chip id returned by the DUP ******************************************************************************/ -unsigned char read_chip_id(void) +unsigned char read_chip_id(unsigned char *revision) { unsigned char id = 0; + unsigned char rev = 0; // Make sure DD is output pinMode(DD, OUTPUT); @@ -275,12 +280,15 @@ unsigned char read_chip_id(void) if(wait_dup_ready() == 1) { // Read ID and revision - id = read_debug_byte(); // ID - read_debug_byte(); // Revision (discard) + id = read_debug_byte(); // ID + rev = read_debug_byte(); // Revision } // Set DD as output pinMode(DD, OUTPUT); + if (revision) { + *revision = rev; + } return id; } @@ -532,41 +540,74 @@ void setup() void loop() { unsigned char chip_id = 0; + unsigned char chip_rev = 0; unsigned char debug_config = 0; unsigned char Continue = 0; + unsigned char command = 0; unsigned char Verify = 0; - + unsigned int read_len = 0; + unsigned int read_count = 0; + unsigned int read_start = 0; + while(!Continue) // Wait for starting { - if(Serial.available()==2) - { - if(Serial.read() == SBEGIN) + if(Serial.available()>=5) + { + command = Serial.read(); + if (command == SBEGIN) { Verify = Serial.read(); Continue = 1; } - else - { + else if (command == CHIP_ID) { + Continue = 1; + } + else if (command == SDUMP) { + Continue = 1; + unsigned char tmp[2]; + tmp[0]=Serial.read(); + tmp[1]=Serial.read(); + read_len = (tmp[0]<<8 | tmp[1]); + tmp[0]=Serial.read(); + tmp[1]=Serial.read(); + read_start = (tmp[0]<<8 | tmp[1]); + } + + while (Serial.available() > 0) { Serial.read(); // Clear RX buffer } + } else { + delay(1); } } debug_init(); - chip_id = read_chip_id(); + chip_id = read_chip_id(&chip_rev); if(chip_id == 0) { Serial.write(ERRO); return; // No chip detected, run loop again. } - - RunDUP(); - debug_init(); - - chip_erase(); + else + { + Serial.write(CHIP_ID); + Serial.write(chip_id); + Serial.write(chip_rev); + } RunDUP(); + if (command == CHIP_ID) { + return; + } debug_init(); + + + if (command == SBEGIN) { + // erase chip only if we are flashing it... + chip_erase(); + RunDUP(); + debug_init(); + } // Switch DUP to external crystal osc. (XOSC) and wait for it to be stable. // This is recommended if XOSC is available during programming. If @@ -577,15 +618,57 @@ void loop() // Enable DMA (Disable DMA_PAUSE bit in debug configuration) debug_config = 0x22; debug_command(CMD_WR_CONFIG, &debug_config, 1); + // Program data (start address must be word aligned [32 bit]) - Serial.write(SRSP); // Request data blocks - digitalWrite(LED, HIGH); unsigned char Done = 0; unsigned char State = WAITING; unsigned char rxBuf[514]; unsigned int BufIndex = 0; unsigned int addr = 0x0000; + + + if (command == SDUMP) { + // dump flash instead of programming it... + addr = read_start * 128; + + while (!Done) { + + //write_flash_memory_block(rxBuf, addr, 512); // src, address, count + unsigned char bank = addr / (512 * 16); + unsigned int offset = (addr % (512 * 16)) * 4; + uint16_t checksum = 0; + read_flash_memory_block(bank, offset, 512, rxBuf); // Bank, address, count, dest. + digitalWrite(LED, HIGH); + Serial.write(FBLOCK); + for(unsigned int i = 0; i < 512; i++) { + Serial.write(rxBuf[i]); + checksum += rxBuf[i]; + } + unsigned char tmp = checksum >> 8; + Serial.write(tmp); + tmp = checksum & 0xff; + Serial.write(tmp); + //digitalWrite(LED, LOW); + addr += (unsigned int)128; + read_count++; + + if(read_count >= read_len) { + Done = 1; + } + + } + + digitalWrite(LED, LOW); + RunDUP(); + return; + } + + + // Start flash programming... + + Serial.write(SRSP); // Request data blocks + digitalWrite(LED, HIGH); while(!Done) { while(Serial.available()) diff --git a/README.md b/README.md index d88de20..c747a98 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,106 @@ CCLoader ======== -Burn CC254x firmware using an Arduino board. + +Note!| +----| +This is fork of the original https://github.com/RedBearLab/CCLoader that adds functionality to also read flash (and to check chip ID/revision). Pull request (https://github.com/RedBearLab/CCLoader/pull/27) for these changes has been submitted, so you may be better off using the original version as this version likely won't be regularly updated (if these changes end up in the mainline). +Help needed, only Linux executable has been updated with new functionality Windows and MacOSX versions need these changes merged to them before they work against the new updated Arduino sketch. + + + +## Burn CC254x firmware using an Arduino board. 1. Load the CCLoader Arduino sketch to the UNO board. 2. Wire the pins: ![image](CCLoader.jpg) 3. Use CCLoader.exe to load the Demo.bin to the UNO board and the board will burn the firmware to the BLE Mini. + +## New functionalty + +* ccloader executable now has three commands/modes: + * id - Read chip ID/Revision + * read - read/dump flash memory (save/backup flash memory before overwriting it, if flash is not protected) + * write - write flash memory + +Note! Currently only Linux executables is updated with the new functionality. Windows and MacOSX executables will need to be updated with changes made to Linux executable before those can be used... + +## Syntax +``` +Usage: ./ccloader_tng [ [ | ]] +Examples: +Read Chip ID: ./ccloader_tng /dev/ttyUSB0 1 id + Write Flash: ./ccloader_tng /dev/ttyUSB0 1 write flash.bin 1 + Read Flash: ./ccloader_tng /dev/ttyUSB0 1 read dump.bin 0 512 +Example: ./ccloader_tng /dev/ttyUSB0 1 id + : 0 -- Default (e.g. UNO) + 1 -- Leonardo/Mini Pro/etc... + : 0 -- No verify (default) + 1 -- Verify (when flashing) + : 0 -- Start flash dump from block (0 = beginning of the flash) + : 512 -- How many blocks to read (512 = 256Kb) +``` + +## Query chip ID + +``` +# ./ccloader_tng /dev/ttyACM0 1 id +Serial port: /dev/ttyACM0 +Device: Leonardo +Baud:115200 data:8 parity:none stopbit:1 DTR:on RTS:off + +Send command: id +Waiting for response... + + Chip ID: 0x41 (CC2541) +Chip Revision: 0x13 + + +Closing serial port +``` + +## Write flash image to chip + +``` +# ./ccloader_tng /dev/ttyACM0 1 write ../../Bin/Demo.bin 1 +Verify enabled (flashing process will take longer) +Serial port: /dev/ttyACM0 +Device: Leonardo +Baud:115200 data:8 parity:none stopbit:1 DTR:on RTS:off +Image file: ../../Bin/Demo.bin +Total blocks: 512 (262144 bytes) + +Send command: write +Waiting for response... + + Chip ID: 0x41 (CC2541) +Chip Revision: 0x13 + +Begin programming... +1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 ^[OR380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 +End programming + +Closing serial port +``` + +## Read flash image from chip + +``` +# ./ccloader_tng /dev/ttyACM0 1 read flashdump.bin 0 512 +Serial port: /dev/ttyACM0 +Device: Leonardo +Baud:115200 data:8 parity:none stopbit:1 DTR:on RTS:off +Image file: flashdump.bin +Total blocks: 512 (262144 bytes) + +Send command: read +Waiting for response... + + Chip ID: 0x41 (CC2541) +Chip Revision: 0x13 + +Reading flash... 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 +Flash Dump Complete + +Closing serial port +``` diff --git a/SourceCode/Linux/Makefile b/SourceCode/Linux/Makefile new file mode 100644 index 0000000..7c2d6af --- /dev/null +++ b/SourceCode/Linux/Makefile @@ -0,0 +1,14 @@ + + +PROGRAM = ccloader_tng + +all: $(PROGRAM) + +clean: + rm -f *~ *.o $(PROGRAM) + + +$(PROGRAM): main.c + $(CC) $(CFLAGS) -o $(PROGRAM) main.c + + diff --git a/SourceCode/Linux/main.c b/SourceCode/Linux/main.c index b6755a1..2f12bbb 100644 --- a/SourceCode/Linux/main.c +++ b/SourceCode/Linux/main.c @@ -5,7 +5,9 @@ extern "C" { #include #include #include +#include #include +#include #include #include #include @@ -15,6 +17,7 @@ extern "C" { int RS232_OpenComport(int, int); int RS232_PollComport(int, unsigned char *, int); +int RS232_ReadBlock(int, unsigned char *, size_t, int); int RS232_SendByte(int, unsigned char); int RS232_SendBuf(int, unsigned char *, int); void RS232_CloseComport(int); @@ -30,7 +33,11 @@ void RS232_disableRTS(int); #define SDATA 0x02 #define SRSP 0x03 #define SEND 0x04 -#define ERRO 0x05 +#define ERRO 0x05 +#define CHIP_ID 0x11 +#define SDUMP 0x12 +#define FBLOCK 0x13 + FILE *pfile = NULL; long fsize = 0; @@ -44,223 +51,327 @@ int end = 0; int Cport[30], error; struct termios new_port_settings, old_port_settings[30]; +const char* comports[2] = { NULL, NULL }; -char comports[30][16]={"/dev/ttyS0","/dev/ttyS1","/dev/ttyS2","/dev/ttyS3","/dev/ttyS4","/dev/ttyS5", - "/dev/ttyS6","/dev/ttyS7","/dev/ttyS8","/dev/ttyS9","/dev/ttyS10","/dev/ttyS11", - "/dev/ttyS12","/dev/ttyS13","/dev/ttyS14","/dev/ttyS15","/dev/ttyUSB0", - "/dev/ttyUSB1","/dev/ttyUSB2","/dev/ttyUSB3","/dev/ttyUSB4","/dev/ttyUSB5", - "/dev/ttyAMA0","/dev/ttyAMA1","/dev/ttyACM0","/dev/ttyACM1", - "/dev/rfcomm0","/dev/rfcomm1","/dev/ircomm0","/dev/ircomm1"}; - -void ProcessProgram(void); + +void ProcessProgram(int cmd); /* * argv[0]----.exe file name -* argv[1]----ComPort number -* argv[2]----file path +* argv[1]----command: id, read, write +* argv[2]----serial device +* argv[3]----file path +* argv[4]----device type +* argv[5]----verify mode */ + +#define CMD_ID 1 +#define CMD_READ 2 +#define CMD_WRITE 3 + + +void usage_help(const char *prgname) +{ + printf("Invalid parameters.\n"); + printf("Usage: %s [ [ | ]]\n", + prgname); + printf("Examples:\n"); + printf("Read Chip ID: %s /dev/ttyUSB0 1 id\n", prgname); + printf(" Write Flash: %s /dev/ttyUSB0 1 write flash.bin 1\n", prgname); + printf(" Read Flash: %s /dev/ttyUSB0 1 read dump.bin 0 512\n", prgname); + printf("Example: %s /dev/ttyUSB0 1 id\n", prgname); + printf(" : 0 -- Default (e.g. UNO)\n"); + printf(" 1 -- Leonardo/Mini Pro/etc...\n"); + printf(" : 0 -- No verify (default)\n"); + printf(" 1 -- Verify (when flashing)\n"); + printf(" : 0 -- Start flash dump from block (0 = beginning of the flash)\n"); + printf(" : 512 -- How many blocks to read (512 = 256Kb)\n"); + + exit(1); +} + + int main(int arg, char *argv[]) { - int fLen = 0; - int device = 0; - - if(arg < 4) - { - printf("Invalid parameters.\n"); - printf("Usage: %s \n", argv[0]); - printf("Example: %s 2 abc.bin 0\n", argv[0]); - printf(" : 0 -- Default (e.g. UNO)\n"); - printf(" 1 -- Leonardo\n"); - return 0; - } - int i; - for(i=0; i<30; i++) - { - if(NULL != strstr(comports[i], argv[1])) - { - com = i; - break; - } - else if(i == 29 && com == -1) - { - printf("Port not found, check if arguments are in the correct order.\n"); - return 0; - } - } - if(1 == RS232_OpenComport(com, 115200)) - { - return 0; // Open comprt error - } - printf("Comport open:\n"); - - device = atoi(argv[3]); - if(device == 0) - { - printf("Device : Default (e.g. UNO)\n\n"); - printf("Baud:115200 data:8 parity:none stopbit:1 DTR:off RTS:off\n"); - RS232_disableDTR(com); - } - else - { - printf("Device: Leonardo\n\n"); - printf("Baud:115200 data:8 parity:none stopbit:1 DTR:on RTS:off\n"); - RS232_enableDTR(com); - } - RS232_disableRTS(com); - - char form[5] = ".bin"; - char format[5] = " "; - fLen = strlen(argv[2]); - if(fLen < 5) - { - printf("File path is invalid!\n"); - return 0; // file path is not valid - } - format[3] = argv[2][fLen-1]; - format[2] = argv[2][fLen-2]; - format[1] = argv[2][fLen-3]; - format[0] = argv[2][fLen-4]; - if(0 != strcmp(form, format)) - { - printf("File format must be .bin"); - return 0; - } - pfile = fopen(argv[2], "rb"); // read only - if(NULL == pfile) - { - printf("file doesn't exist or is occupied!\n"); - return 0; + int device = 0; + unsigned char cmd_buf[5] = { 0,0,0,0,0 }; + int verify = 0; + + const char *serialport = argv[1]; + const char *device_arg = argv[2]; + const char *command = argv[3]; + const char *filename = argv[4]; + const char *verify_arg = argv[5]; + const char *size_arg = argv[6]; + + + if (arg <=3) usage_help(argv[0]); + verify=atoi(verify_arg); + + if (strncmp(command,"id",2)==0) { + cmd_buf[0]=CHIP_ID; + filename="/dev/null"; + } + else if (strncmp(command,"read",4)==0) { + int read_size = 0; + int start_block = 0; + + if (arg <= 6) usage_help(argv[0]); + read_size = atoi(size_arg); + if (read_size < 1 || read_size > 1024) { + printf("Invalid number of blocks to read specified: %d\n",read_size); + return 1; + } + start_block=verify; + if (start_block < 0 || start_block > 1024) { + printf("Invalid starting block specified: %d\n", start_block); + return 1; } - printf("File open success!\n"); - fseek(pfile,0,SEEK_SET); + BlkTot=read_size; + fsize=BlkTot*512; + cmd_buf[0]=SDUMP; + cmd_buf[1]=(BlkTot >> 8) & 0xff; + cmd_buf[2]=BlkTot & 0xff; + cmd_buf[3]=(start_block >> 8) & 0xff; + cmd_buf[4]=start_block & 0xff; + } + else if (strncmp(command,"write",5)==0) { + if (arg <= 5) usage_help(argv[0]); + cmd_buf[0]=SBEGIN; + cmd_buf[1]=(verify > 0 ? 1 : 0); + if (verify > 0) { + printf("Verify enabled (flashing process will take longer)\n"); + } + } + else { + printf("Invalid command: %s\n",command); + return 1; + } + + + if (!serialport || strlen(serialport) < 1) { + printf("Missing serial port parameter\n"); + return 1; + } + // dynamically generate entry in comports table... + com = 0; + comports[com]=serialport; + + if(1 == RS232_OpenComport(com, 115200)) { + return 1; // Open comprt error + } + printf("Serial port: %s\n",serialport); + + device = atoi(device_arg); + if(device == 0) { + printf("Device : Default (e.g. UNO)\n"); + printf("Baud:115200 data:8 parity:none stopbit:1 DTR:off RTS:off\n"); + RS232_disableDTR(com); + } else { + printf("Device: Leonardo\n"); + printf("Baud:115200 data:8 parity:none stopbit:1 DTR:on RTS:off\n"); + RS232_enableDTR(com); + } + RS232_disableRTS(com); + + + if (strlen(filename) < 1) { + printf("invalid filename: %s\n",filename); + return 1; + } + + if (BlkTot > 0) { + // Read mode so create new file for to save flas into... + pfile = fopen(filename, "wb"); // create new file + if(NULL == pfile) { + printf("cannot create file: %s (%d)\n",filename,errno); + return 1; + } + } else { + pfile = fopen(filename, "rb"); // read only + if(NULL == pfile) { + printf("cannot open file: %s (%d)\n",filename,errno); + return 1; + } + + fseek(pfile,0,SEEK_SET); fseek(pfile,0,SEEK_END); fsize = ftell(pfile); fseek(pfile,0,SEEK_SET); + if (fsize < 1 && cmd_buf[0] != CHIP_ID) { + printf("Cannot flash empty file!\n"); + return 1; + } //BlkTot = fsize / 512; - Remain = fsize % 512; - if(Remain != 0) - { - BlkTot = fsize / 512 + 1; - printf("Warning: file size isn't the integer multiples of 512, last bytes will be set to 0xFF\n"); - } - else - { - BlkTot = fsize / 512; - } + Remain = fsize % 512; + if(Remain != 0) { + BlkTot = fsize / 512 + 1; + printf("Warning: file size isn't the integer multiples of 512, last bytes will be set to 0xFF\n"); + } else { + BlkTot = fsize / 512; + } + } + + if (cmd_buf[0] != CHIP_ID) { + printf("Image file: %s\n",filename); + printf("Total blocks: %d (%ld bytes)\n", BlkTot, fsize); + } + BlkNum = 0; + + + printf("\nSend command: %s\n",command); + //fprintf(stderr, "SEND: %02x %02x %02x\n", cmd_buf[0], cmd_buf[1], cmd_buf[2]); + + if(RS232_SendBuf(com, cmd_buf, sizeof(cmd_buf)) != sizeof(cmd_buf)) { + printf("Communication failure!\n"); + fclose(pfile); + RS232_CloseComport(com); + return 1; + } + + printf("Waiting for response...\n\n"); - printf("Block total: %d\n", BlkTot); - BlkNum = 0; - - printf("Enable transmission...\n"); - unsigned char buf[2] = {SBEGIN, 0}; // Enable transmission, do not verify - if(RS232_SendBuf(com, buf, 2) != 2) - { - printf("Enable failed!\n"); - fclose(pfile); - printf("File closed!\n"); - RS232_CloseComport(com); - printf("Comport closed!\n"); - return 0; + while(!end) { + ProcessProgram(cmd_buf[0]); + } + printf("\nClosing serial port\n"); + BlkNum = 0; + DownloadProgress = 0; + fclose(pfile); + RS232_CloseComport(com); + + return 0; +} + +void ProcessProgram(int cmd) +{ + int len; + unsigned char rx; + len = RS232_PollComport(com, &rx, 1); + if(len > 0) { + //fprintf(stderr,"READ: %02x\n", rx); + + switch(rx) { + + case CHIP_ID: + { + unsigned char buf[2]; + len = RS232_ReadBlock(com, buf, 2, 5); + if (len < 2) { + end = 1; + printf("Did not receive chip ID (%d)\n", len); + } else { + printf(" Chip ID: 0x%x (CC25%02x)\n",buf[0],buf[0]); + printf("Chip Revision: 0x%x\n\n",buf[1]); + if (cmd == CHIP_ID) { + end = 1; + } + } + } + break; + + case FBLOCK: + { + unsigned char buf[514]; + size_t len; + unsigned short checksum1 = 0; + unsigned short checksum2 = 0; + int i; + + memset(buf,0,sizeof(buf)); + BlkNum++; + if (BlkNum == 1) + printf("Reading flash..."); + printf(" %d",BlkNum); + fflush(stdout); + + len = RS232_ReadBlock(com, buf, 514, 10); + for (i=0; i<512; i++) { + checksum1 += buf[i]; } - else - { - printf("Request sent already! Waiting for respond...\n"); + checksum2 = (buf[512]<<8 | buf[513]); + if (checksum1 != checksum2) { + printf("\nBlock %d: checksum mismatch: %04x vs %04x\n",BlkNum,checksum1,checksum2); } - while(!end) - { - ProcessProgram(); + len=fwrite(buf,1,512,pfile); + if (len < 512) { + printf("failed to write block to file: %d\n",errno); + exit(1); } - printf("Program successfully!\n"); - BlkNum = 0; - DownloadProgress = 0; - fclose(pfile); - printf("File closed!\n"); - RS232_CloseComport(com); - printf("Comport closed!\n"); - - return 0; -} -void ProcessProgram() -{ - int len; - unsigned char rx; - len = RS232_PollComport(com, &rx, 1); - if(len > 0) - { - switch(rx) - { - case SRSP: - { - if(BlkNum == BlkTot) - { - unsigned char temp = SEND; - RS232_SendByte(com, temp); - end = 1; - } - else - { - if(BlkNum == 0) - { - printf("Begin programming...\n"); - } - DownloadProgress = 1; - unsigned char buf[515]; - buf[0] = SDATA; - - if((BlkNum == (BlkTot-1)) && (Remain != 0)) - { - fread(buf+1, Remain, 1, pfile); - int filled = 512 - Remain; - //int i = 0; - for(int i = 0; i= BlkTot) { + printf("\nFlash Dump Complete\n"); + end = 1; + break; + } + + } + break; + + case SRSP: + { + if (BlkNum == BlkTot) { + unsigned char temp = SEND; + RS232_SendByte(com, temp); + end = 1; + printf("\nEnd programming\n"); + } else { + if(BlkNum == 0) { + printf("Begin programming...\n"); + } + DownloadProgress = 1; + unsigned char buf[515]; + buf[0] = SDATA; + + if((BlkNum == (BlkTot-1)) && (Remain != 0)) { + fread(buf+1, Remain, 1, pfile); + int filled = 512 - Remain; + //int i = 0; + for(int i = 0; i> 8) & 0x00FF; - buf[514] = CheckSum & 0x00FF; + unsigned short CheckSum = 0x0000; + //unsigned int i; + for(unsigned int i=0; i<512; i++) { + CheckSum += (unsigned char)buf[i+1]; + } + buf[513] = (CheckSum >> 8) & 0x00FF; + buf[514] = CheckSum & 0x00FF; - RS232_SendBuf(com, buf, 515); - BlkNum++; - printf("%d ", BlkNum); - } - break; - } - - case ERRO: - { - if(DownloadProgress == 1) - { - end = 1; - printf("Verify failed!\n"); - } - else - { - end = 1; - printf("No chip detected!\n"); - } - break; - } - - default: - break; - } - len = 0; + RS232_SendBuf(com, buf, 515); + BlkNum++; + printf("%d ", BlkNum); + fflush(stdout); + } + } + break; + + case ERRO: + { + if(DownloadProgress == 1) { + end = 1; + printf("Verify failed!\n"); + } else { + end = 1; + printf("No chip detected!\n"); + } + } + break; + + default: + printf("Unknown response: %x\n",rx); + break; } + + len = 0; + } + } int RS232_OpenComport(int comport_number, int baudrate) @@ -390,6 +501,32 @@ int RS232_PollComport(int comport_number, unsigned char *buf, int size) return(n); } +int RS232_ReadBlock(int comport_number, unsigned char *buf, size_t size, int timeout) +{ + + size_t read_left = size; + size_t len; + time_t t_start = time(NULL); + + while (read_left > 0) { + do { + len = read(Cport[comport_number], &buf[size-read_left], read_left); + } while (len < 0 && errno==EINTR); + if (len < 0) { + printf("error reading serial port: %d (%d)\n",len,errno); + exit(1); + } + if (timeout > 0) { + if ((time(NULL)-t_start) > timeout) { + printf("timeout reading serial port\n"); + exit(2); + } + } + read_left-=len; + } + + return size; +} int RS232_SendByte(int comport_number, unsigned char byte) {