OpenCores
URL https://opencores.org/ocsvn/gecko3/gecko3/trunk

Subversion Repositories gecko3

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /gecko3/trunk/GECKO3COM/gecko3com-fw/firmware/src
    from Rev 32 to Rev 33
    ↔ Reverse comparison
  •

Rev 32 → Rev 33

/fpga_load.c
69,19 → 69,23
int8_t fpga_scan_file(const xdata unsigned char *p, idata uint16_t *offset, \
idata uint16_t *length, xdata Fpga_Info* info)
{
idata uint8_t string_length = 0, chars_left_to_read = 0;
static idata uint8_t string_length = 0, chars_left_to_read = 0;
xdata uint16_t local_position = *offset;
 
for(local_position; local_position < *length; local_position++) {
//printf_tiny("fi: %d\n",local_position);
/* information found, copy data to output array */
if(chars_left_to_read < string_length) {
//printf_tiny("fi: %d\n",local_position);
info->info[chars_left_to_read++] = p[local_position];
/* end of information, return successfull */
if(chars_left_to_read == string_length) {
//print_info("l\n");
info->position = local_position;
*offset = local_position+1;
string_length = 0;
chars_left_to_read = 0;
return FPGA_INFO_COMPLETE;
}
else {
/gecko3com_main.c
170,13 → 170,14
if(usb_tmc_transfer.new_transfer == NEWTRANSFER) {
continue_analyse = 0;
fpga_file_header.type = FPGA_TYPE;
usb_tmc_transfer.transfer_size += USB_TMC_HEADER_SIZE;
}
 
/* first value to read from the header file is the fpga type */
if(fpga_file_header.type == FPGA_TYPE){
 
if(fpga_scan_file(buffer, offset, byte_count, &fpga_file_header) \
== FPGA_INFO_COMPLETE) {
/* compare fpga type from header with value in eeprom */
if(!eeprom_read(FPGA_TYPE_OFFSET, fpga_type, FPGA_TYPE_LEN)){
return 0;
198,9 → 199,9
 
/* second value to read from the header file is the file length */
if(fpga_file_header.type == FILE_LENGTH){
 
if(fpga_scan_file(buffer, offset, byte_count, &fpga_file_header) \
== FPGA_INFO_COMPLETE) {
((uint8_t*)&file_size)[0] = fpga_file_header.info[2];
((uint8_t*)&file_size)[1] = fpga_file_header.info[1];
((uint8_t*)&file_size)[2] = fpga_file_header.info[0];
215,7 → 216,6
 
/* adjust the offset and byte_count variables to point to the
* binary data after the header */
usb_tmc_transfer.transfer_size += USB_TMC_HEADER_SIZE;
usb_tmc_transfer.transfer_size -= *offset;
 
return continue_analyse;
241,6 → 241,7
/* do we still analyze the file header? */
if(file_size == 0) {
if(!app_check_fpga_type_from_header(offset, byte_count)) {
//print_err("bad\n");
return 0;
}
 
266,6 → 267,7
/* transfer finished, finishing configuration */
if(file_size == 0) {
//print_info("end\n");
if(!fpga_load_end()) {
return 0;
}
416,8 → 418,8
}
}
 
/* to "delete" means to set the file_size at the beginning of the confguration
file slot to zero */
/* to "delete" means to set the file_size at the beginning of the confguration
* file slot to zero */
local_uint32_var = 0;
spiflash_write(&flash_dr, &flash_adress, (uint8_t*)&local_uint32_var,4);
usb_tmc_state = TMC_STATE_IDLE;
591,7 → 593,8
if(usb_tmc_state == TMC_STATE_IDLE || usb_tmc_transfer.transfer_size == 0){
 
/* start to analyze the data in Endpoint 2 if it is a correct TMC header */
/* start to analyze the data in Endpoint 2 if it is a correct TMC
* header */
tmc_header = (tHeader*)EP2FIFOBUF;
 
/* bTag sanity check. store bTag for correct IN transfer response */
616,7 → 619,7
usb_tmc_state = TMC_STATE_OUT_TRANSFER;
usb_tmc_transfer.nbytes_rxd = 0;
/* when we receive an new out message before we sent the response,
/* when we receive an new out message before we sent the response,
* we have to clear the response queue first*/
IEEE488_clear_mav();
usb_tmc_transfer.nbytes_txd = 0;
775,7 → 778,8
}
}
usb_tmc_transfer.nbytes_rxd += ((EP2BCH << 8) + EP2BCL - USB_TMC_HEADER_SIZE);
usb_tmc_transfer.nbytes_rxd += ((EP2BCH << 8) + EP2BCL - \
USB_TMC_HEADER_SIZE);
 
/* finished handling usb package.
* rearm OUT endpoint to receive new data */
914,10 → 918,13
// clear_timer_irq();
// #ifdef DEBUG_LEVEL_ERROR
// print_err("Watchdog timed out! System reset\n");
//mdelay(100); /* wait 100 ms to give the uart some time to transmit */
//mdelay(100); /* wait 100 ms to give the uart some time to
// * transmit */
// #endif
 
/* simulate CPU reset */ /* FIXME this stuff here does not work. no idea how to simulate an CPU reset instead... */
/* simulate CPU reset */ /* FIXME this stuff here does not work.
* no idea how to simulate an CPU reset
* instead... */
/* _asm
ljmp __reset_vector
_endasm;*/
958,7 → 965,7
USBCS |= bmDISCON;
 
#ifdef DEBUG_LEVEL_ERROR
//ser_init();
ser_init();
//printf_tiny("hi\n");
#endif
 
1000,9 → 1007,9
spi_base_adress += 4;
 
/* debug stuff */
response_queue.buf[0] = init_spiflash(&flash_dr);
IEEE488_set_mav();
response_queue.length = 1;
//response_queue.buf[0] = init_spiflash(&flash_dr);
//IEEE488_set_mav();
//response_queue.length = 1;
 
/* there is nothing to configure when the filesize is 0 or 0xFFFFFFFF */
if(file_size == 0 || file_size == 0xFFFFFFFF) {
1014,9 → 1021,9
i = TMC_RESPONSE_QUEUE_LENGTH-1;
while(file_size > 0) {
set_led_ext(led_color); /* show which config we load */
 
if(i > file_size) {
i = (uint8_t)file_size;
i = (uint8_t)file_size;
}
spiflash_read(&flash_dr, &spi_base_adress, response_queue.buf, i);
/Makefile
26,8 → 26,8
 
BOARD = GECKO3MAIN #currently the only supported board
 
DEBUG = --debug -DDEBUG_LEVEL_INFO
#DEBUG =
#DEBUG = --debug -DDEBUG_LEVEL_INFO
DEBUG =
 
MEMOPTS = --code-loc 0x0000 --code-size 0x3A00 --xram-loc 0x3A00 --xram-size 0x0600 -Wl '-b USBDESCSEG = 0xE000'
 

powered by: WebSVN 2.1.0

© copyright 1999-2024 OpenCores.org, equivalent to Oliscience, all rights reserved. OpenCores®, registered trademark.