xiemeng / BlueFlashTool · Commits

Commit 08e2cdf9946c26fa35e7818deec8be8b5506f2cb

Authored by xiemeng
1 parent 79df712c

update mic check

Inline Side-by-side
Showing 1 changed file with 12 additions and 82 deletions
@@ -701,25 +701,17 @@ const char dft_bdaddr[6] = {0x00,0x00,0x00,0x3F,0x9f,0x94}; @@ -701,25 +701,17 @@ const char dft_bdaddr[6] = {0x00,0x00,0x00,0x3F,0x9f,0x94};
701 int fileCheck(,void) 701 int fileCheck(,void)
702 { 702 {
703 int i; 703 int i;
704 - /*BOOL flag = FALSE;*/ 704 + U32 *p1;
  705 + char *p;
705 int ret = FILE_CHCK_SUCCESSFUL; 706 int ret = FILE_CHCK_SUCCESSFUL;
706 - U32 *p1 = (U32 *)TTYInfo.buff_Binfile;  
707 BOOT_HEADER *p_header; 707 BOOT_HEADER *p_header;
708 - char *p = TTYInfo.buff_Binfile+MAC_ADDR_OFFSET+BAUDRATE_DET_DATA_LEN+HEADER_LEN;  
709 unsigned char baaddr[6]; 708 unsigned char baaddr[6];
710 LARGE_INTEGER ticks; 709 LARGE_INTEGER ticks;
711 710
712 if (TTYInfo.dwFileSize < MAC_ADDR_OFFSET + BAUDRATE_DET_DATA_LEN + HEADER_LEN + 0x2000) 711 if (TTYInfo.dwFileSize < MAC_ADDR_OFFSET + BAUDRATE_DET_DATA_LEN + HEADER_LEN + 0x2000)
713 - {  
714 - /*flag = TRUE;*/  
715 -  
716 return FILE_CHCK_SUCCESSFUL; 712 return FILE_CHCK_SUCCESSFUL;
717 - }  
718 p1 = (U32 *)TTYInfo.buff_Binfile; 713 p1 = (U32 *)TTYInfo.buff_Binfile;
719 -  
720 memcpy(baaddr,dft_bdaddr,sizeof(baaddr)); 714 memcpy(baaddr,dft_bdaddr,sizeof(baaddr));
721 -  
722 - /***********det data check*********************/  
723 for (i=0;i<BAUDRATE_DET_DATA_LEN/4;i++) 715 for (i=0;i<BAUDRATE_DET_DATA_LEN/4;i++)
724 { 716 {
725 if (*p1++ != BAUDRATE_DET_DATA) 717 if (*p1++ != BAUDRATE_DET_DATA)
@@ -728,112 +720,50 @@ int fileCheck(,void) @@ -728,112 +720,50 @@ int fileCheck(,void)
728 break; 720 break;
729 } 721 }
730 } 722 }
731 -  
732 p_header = (BOOT_HEADER *)(TTYInfo.buff_Binfile+BAUDRATE_DET_DATA_LEN); 723 p_header = (BOOT_HEADER *)(TTYInfo.buff_Binfile+BAUDRATE_DET_DATA_LEN);
733 - /***********header check*********************/  
734 if (ret == FILE_CHCK_SUCCESSFUL) 724 if (ret == FILE_CHCK_SUCCESSFUL)
735 { 725 {
736 if (p_header->rx_header_start != HEADER_START) 726 if (p_header->rx_header_start != HEADER_START)
737 - {  
738 ret = WRONG_FILE_FORMAT; 727 ret = WRONG_FILE_FORMAT;
739 - }  
740 else if (p_header->rx_total_bytes != (TTYInfo.dwFileSize - BAUDRATE_DET_DATA_LEN - sizeof(BOOT_HEADER))) 728 else if (p_header->rx_total_bytes != (TTYInfo.dwFileSize - BAUDRATE_DET_DATA_LEN - sizeof(BOOT_HEADER)))
741 - {  
742 ret = WRONG_FILE_FORMAT; 729 ret = WRONG_FILE_FORMAT;
743 - }  
744 } 730 }
745 -  
746 - /***********checksum*********************/  
747 if (ret == FILE_CHCK_SUCCESSFUL) 731 if (ret == FILE_CHCK_SUCCESSFUL)
748 { 732 {
749 int checksum = 0; 733 int checksum = 0;
750 p1 = (U32*)(TTYInfo.buff_Binfile + BAUDRATE_DET_DATA_LEN + sizeof(BOOT_HEADER)); 734 p1 = (U32*)(TTYInfo.buff_Binfile + BAUDRATE_DET_DATA_LEN + sizeof(BOOT_HEADER));
751 for(i=0;i<(p_header->rx_total_bytes-4)/4;i++) 735 for(i=0;i<(p_header->rx_total_bytes-4)/4;i++)
752 - {  
753 checksum += *p1++; 736 checksum += *p1++;
754 - }  
755 -  
756 if ((checksum != *p1)||(checksum != p_header->rx_checksum)) 737 if ((checksum != *p1)||(checksum != p_header->rx_checksum))
757 - {  
758 ret = CHECKSUM_ERROR; 738 ret = CHECKSUM_ERROR;
759 - }  
760 } 739 }
761 -  
762 -  
763 -//BOOL QueryPerformanceCounter(LARGE_INTEGER *lpPerformanceCount)  
764 if (QueryPerformanceCounter(&ticks)) 740 if (QueryPerformanceCounter(&ticks))
765 { 741 {
766 char szMessage[70]; 742 char szMessage[70];
767 baaddr[0] = (unsigned char)(ticks.LowPart&0x000000ff); 743 baaddr[0] = (unsigned char)(ticks.LowPart&0x000000ff);
768 baaddr[1] = (unsigned char)(ticks.LowPart>>8)&0x000000ff; 744 baaddr[1] = (unsigned char)(ticks.LowPart>>8)&0x000000ff;
769 baaddr[2] = (unsigned char)(ticks.LowPart>>16)&0x000000ff; 745 baaddr[2] = (unsigned char)(ticks.LowPart>>16)&0x000000ff;
770 -  
771 memset(szMessage,0,70); 746 memset(szMessage,0,70);
772 wsprintf(szMessage, "0x%02x%02x%02x%02x%02x%02x\r\n",baaddr[5],baaddr[4],baaddr[3],baaddr[2],baaddr[1],baaddr[0]); 747 wsprintf(szMessage, "0x%02x%02x%02x%02x%02x%02x\r\n",baaddr[5],baaddr[4],baaddr[3],baaddr[2],baaddr[1],baaddr[0]);
773 OutputABuffer(szMessage); 748 OutputABuffer(szMessage);
774 - //UpdateStatus(szMessage);  
775 } 749 }
776 else 750 else
777 - {  
778 ret = READ_CPU_TICKS_ERR; 751 ret = READ_CPU_TICKS_ERR;
779 - }  
780 -  
781 -// "Optek Bt\0\0"  
782 - *p++ = 'O';  
783 - *p++ = 'p';  
784 - *p++ = 't';  
785 - *p++ = 'e';  
786 - *p++ = 'k';  
787 - *p++ = ' ';  
788 - *p++ = 'B';  
789 - *p++ = 't';  
790 -// *p++ = 0;  
791 -  
792 -//u32 wr_cn;  
793 - *p++ = 0;  
794 - *p++ = 0;  
795 - *p++ = 0;  
796 - *p++ = 0;  
797 -  
798 - *p++ = 0;  
799 - *p++ = 0;  
800 - *p++ = 0;  
801 - *p++ = 0; 752 + p = TTYInfo.buff_Binfile+MAC_ADDR_OFFSET+BAUDRATE_DET_DATA_LEN+HEADER_LEN;
  753 + strcpy(p,"Optek Bt");
  754 + p+=8;
  755 + memset(p,0,8); //*p++ = 0; *p++ = 0; *p++ = 0; *p++ = 0; *p++ = 0; *p++ = 0; *p++ = 0; *p++ = 0;
  756 + p+=8;
802 memcpy(p,baaddr,sizeof(baaddr)); 757 memcpy(p,baaddr,sizeof(baaddr));
803 p+=6; 758 p+=6;
804 759
805 - //if (flag)  
806 - //{  
807 - p = TTYInfo.buff_Binfile + MAC_ADDR_OFFSET + BAUDRATE_DET_DATA_LEN + HEADER_LEN + 0X1000;  
808 - /*}  
809 - else  
810 - {  
811 - OutputDebugString("àÓàÓàÓ\n");  
812 - p = fData + MAC_ADDR_OFFSET + 0X1000 + 0xb20;  
813 - }*/  
814 - *p++ = 'O';  
815 - *p++ = 'p';  
816 - *p++ = 't';  
817 - *p++ = 'e';  
818 - *p++ = 'k';  
819 - *p++ = ' ';  
820 - *p++ = 'B';  
821 - *p++ = 't';  
822 -  
823 -//u32 wr_cn;  
824 - *p++ = 0;  
825 - *p++ = 0;  
826 - *p++ = 0;  
827 - *p++ = 0;  
828 -  
829 - *p++ = 0;  
830 - *p++ = 0;  
831 - *p++ = 0;  
832 - *p++ = 0;  
833 -// bt mac id 760 + p = TTYInfo.buff_Binfile + MAC_ADDR_OFFSET + BAUDRATE_DET_DATA_LEN + HEADER_LEN + 0X1000;
  761 + strcpy(p,"Optek Bt");
  762 + p+=8;
  763 + memset(p,0,8); //*p++ = 0; *p++ = 0; *p++ = 0; *p++ = 0; *p++ = 0; *p++ = 0; *p++ = 0; *p++ = 0;
  764 + p+=8;
834 memcpy(p,baaddr,sizeof(baaddr)); 765 memcpy(p,baaddr,sizeof(baaddr));
835 p+=6; 766 p+=6;
836 - //a-a5  
837 if (ret == FILE_CHCK_SUCCESSFUL) 767 if (ret == FILE_CHCK_SUCCESSFUL)
838 { 768 {
839 int checksum = 0; 769 int checksum = 0;
Please register or login to post a comment