исправлен баг с микросхемой ZD24
This commit is contained in:
parent
99a48b1e16
commit
7d733cb0ec
@ -69,7 +69,7 @@
|
|||||||
<listOptionValue builtIn="false" value="SYS_160_AUX_60"/>
|
<listOptionValue builtIn="false" value="SYS_160_AUX_60"/>
|
||||||
<listOptionValue builtIn="false" value="${SYSCONFIG_TOOL_SYMBOLS}"/>
|
<listOptionValue builtIn="false" value="${SYSCONFIG_TOOL_SYMBOLS}"/>
|
||||||
<listOptionValue builtIn="false" value="CPU1"/>
|
<listOptionValue builtIn="false" value="CPU1"/>
|
||||||
<listOptionValue builtIn="false" value="USE_25MHZ_XTAL"/>
|
<listOptionValue builtIn="false" value="USE_20MHZ_XTAL"/>
|
||||||
</option>
|
</option>
|
||||||
<option id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.OPT_LEVEL.1821443401" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.OPT_LEVEL" useByScannerDiscovery="false" value="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.OPT_LEVEL.off" valueType="enumerated"/>
|
<option id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.OPT_LEVEL.1821443401" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.OPT_LEVEL" useByScannerDiscovery="false" value="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.OPT_LEVEL.off" valueType="enumerated"/>
|
||||||
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_SUPPRESS.842502178" name="Suppress diagnostic <id> (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_SUPPRESS" useByScannerDiscovery="false" valueType="stringList">
|
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_SUPPRESS.842502178" name="Suppress diagnostic <id> (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_SUPPRESS" useByScannerDiscovery="false" valueType="stringList">
|
||||||
|
@ -41,10 +41,18 @@ uint16_t ZD24C02A_verify_16(uint16_t Addr, uint16_t * Array, uint16_t quant)
|
|||||||
uint16_t ZD24C02A_write(uint32_t Addr, uint16_t quant8, uint16_t * write_data)
|
uint16_t ZD24C02A_write(uint32_t Addr, uint16_t quant8, uint16_t * write_data)
|
||||||
{
|
{
|
||||||
uint32_t i=0;
|
uint32_t i=0;
|
||||||
uint16_t addr_write_data[8];
|
uint16_t addr_write_data[0x100];
|
||||||
uint16_t quant16;
|
uint16_t quant16;
|
||||||
|
|
||||||
if(quant8 > 8)
|
quant16 = quant16bitWords(quant8);
|
||||||
|
copy16_to_8(write_data, addr_write_data, quant16);
|
||||||
|
|
||||||
|
for(i = 0; i < quant8; i += 1)
|
||||||
|
{
|
||||||
|
if( ZD24C02A_write_8(Addr+i, addr_write_data+i, 1)) return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* if(quant8 > 8)
|
||||||
{
|
{
|
||||||
for(i = 0; i < (quant8-8); i += 8)
|
for(i = 0; i < (quant8-8); i += 8)
|
||||||
{//â ýòîì öèêëå òîëüêî ïîëíûå ïîñûëêè ïî 8 áàéò
|
{//â ýòîì öèêëå òîëüêî ïîëíûå ïîñûëêè ïî 8 áàéò
|
||||||
@ -59,6 +67,7 @@ uint16_t ZD24C02A_write(uint32_t Addr, uint16_t quant8, uint16_t * write_data)
|
|||||||
copy16_to_8(write_data, addr_write_data, quant16);
|
copy16_to_8(write_data, addr_write_data, quant16);
|
||||||
if( ZD24C02A_write_8(Addr+i, addr_write_data, (quant8 - i))) return 1;
|
if( ZD24C02A_write_8(Addr+i, addr_write_data, (quant8 - i))) return 1;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,8 +30,8 @@
|
|||||||
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
#include "board_old.h"
|
||||||
#include "f28x_project.h"
|
#include "f28x_project.h"
|
||||||
#include "board.h"
|
|
||||||
#include "clb.h"
|
#include "clb.h"
|
||||||
#include "xbar.h"
|
#include "xbar.h"
|
||||||
#include "xbar1.h"
|
#include "xbar1.h"
|
||||||
@ -46,7 +46,7 @@
|
|||||||
// Board_init use the individual Module_inits
|
// Board_init use the individual Module_inits
|
||||||
//
|
//
|
||||||
//*****************************************************************************
|
//*****************************************************************************
|
||||||
void Board_init()
|
void Board_old_init()
|
||||||
{
|
{
|
||||||
EALLOW;
|
EALLOW;
|
||||||
|
|
||||||
@ -62,7 +62,7 @@ void Board_init()
|
|||||||
// PINMUX Configurations
|
// PINMUX Configurations
|
||||||
//
|
//
|
||||||
//*****************************************************************************
|
//*****************************************************************************
|
||||||
void PinMux_init()
|
void PinMux_old_init()
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// PinMux for modules assigned to CPU1
|
// PinMux for modules assigned to CPU1
|
||||||
@ -84,12 +84,12 @@ void PinMux_init()
|
|||||||
// CLB Configurations
|
// CLB Configurations
|
||||||
//
|
//
|
||||||
//*****************************************************************************
|
//*****************************************************************************
|
||||||
void CLB_init(){
|
void CLB_old_init(){
|
||||||
CLB_TILE_CLKGEN_M_init();
|
CLB_TILE_CLKGEN_M_init();
|
||||||
CLB_TILE_CLKGEN_S_init();
|
CLB_TILE_CLKGEN_S_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CLB_TILE_CLKGEN_M_init(){
|
void CLB_old_TILE_CLKGEN_M_init(){
|
||||||
CLB_setOutputMask(CLB_TILE_CLKGEN_M_BASE,
|
CLB_setOutputMask(CLB_TILE_CLKGEN_M_BASE,
|
||||||
(0UL << 0UL) |
|
(0UL << 0UL) |
|
||||||
(1UL << 17UL), true);
|
(1UL << 17UL), true);
|
||||||
@ -131,7 +131,7 @@ void CLB_TILE_CLKGEN_M_init(){
|
|||||||
initCLB_CLKGEN_M(CLB_TILE_CLKGEN_M_BASE);
|
initCLB_CLKGEN_M(CLB_TILE_CLKGEN_M_BASE);
|
||||||
CLB_enableCLB(CLB_TILE_CLKGEN_M_BASE);
|
CLB_enableCLB(CLB_TILE_CLKGEN_M_BASE);
|
||||||
}
|
}
|
||||||
void CLB_TILE_CLKGEN_S_init(){
|
void CLB_old_TILE_CLKGEN_S_init(){
|
||||||
CLB_setOutputMask(CLB_TILE_CLKGEN_S_BASE,
|
CLB_setOutputMask(CLB_TILE_CLKGEN_S_BASE,
|
||||||
(0UL << 0UL), true);
|
(0UL << 0UL), true);
|
||||||
CLB_enableOutputMaskUpdates(CLB_TILE_CLKGEN_S_BASE);
|
CLB_enableOutputMaskUpdates(CLB_TILE_CLKGEN_S_BASE);
|
||||||
@ -178,13 +178,13 @@ void CLB_TILE_CLKGEN_S_init(){
|
|||||||
// CLBOUTPUTXBAR Configurations
|
// CLBOUTPUTXBAR Configurations
|
||||||
//
|
//
|
||||||
//*****************************************************************************
|
//*****************************************************************************
|
||||||
void CLB_OUTPUTXBAR_init(){
|
void CLB_old_OUTPUTXBAR_init(){
|
||||||
CLB_OUTPUTXBAR_CLKGEN_CLK_M_init();
|
CLB_OUTPUTXBAR_CLKGEN_CLK_M_init();
|
||||||
CLB_OUTPUTXBAR_CLKGEN_CLK_S_init();
|
CLB_OUTPUTXBAR_CLKGEN_CLK_S_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void CLB_OUTPUTXBAR_CLKGEN_CLK_M_init(){
|
void CLB_old_OUTPUTXBAR_CLKGEN_CLK_M_init(){
|
||||||
XBAR_setOutputLatchMode(CLBOUTPUTXBAR_BASE, CLB_OUTPUTXBAR_CLKGEN_CLK_M, false);
|
XBAR_setOutputLatchMode(CLBOUTPUTXBAR_BASE, CLB_OUTPUTXBAR_CLKGEN_CLK_M, false);
|
||||||
XBAR_invertOutputSignal(CLBOUTPUTXBAR_BASE, CLB_OUTPUTXBAR_CLKGEN_CLK_M, false);
|
XBAR_invertOutputSignal(CLBOUTPUTXBAR_BASE, CLB_OUTPUTXBAR_CLKGEN_CLK_M, false);
|
||||||
|
|
||||||
@ -195,7 +195,7 @@ void CLB_OUTPUTXBAR_CLKGEN_CLK_M_init(){
|
|||||||
XBAR_enableOutputMux(CLBOUTPUTXBAR_BASE, CLB_OUTPUTXBAR_CLKGEN_CLK_M, XBAR_MUX00);
|
XBAR_enableOutputMux(CLBOUTPUTXBAR_BASE, CLB_OUTPUTXBAR_CLKGEN_CLK_M, XBAR_MUX00);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CLB_OUTPUTXBAR_CLKGEN_CLK_S_init(){
|
void CLB_old_OUTPUTXBAR_CLKGEN_CLK_S_init(){
|
||||||
XBAR_setOutputLatchMode(CLBOUTPUTXBAR_BASE, CLB_OUTPUTXBAR_CLKGEN_CLK_S, false);
|
XBAR_setOutputLatchMode(CLBOUTPUTXBAR_BASE, CLB_OUTPUTXBAR_CLKGEN_CLK_S, false);
|
||||||
XBAR_invertOutputSignal(CLBOUTPUTXBAR_BASE, CLB_OUTPUTXBAR_CLKGEN_CLK_S, false);
|
XBAR_invertOutputSignal(CLBOUTPUTXBAR_BASE, CLB_OUTPUTXBAR_CLKGEN_CLK_S, false);
|
||||||
|
|
@ -83,23 +83,23 @@ extern "C"
|
|||||||
//
|
//
|
||||||
//*****************************************************************************
|
//*****************************************************************************
|
||||||
#define CLB_TILE_CLKGEN_M_BASE CLB1_BASE
|
#define CLB_TILE_CLKGEN_M_BASE CLB1_BASE
|
||||||
void CLB_TILE_CLKGEN_M_init();
|
void CLB_old_TILE_CLKGEN_M_init();
|
||||||
#define CLB_TILE_CLKGEN_S_BASE CLB2_BASE
|
#define CLB_TILE_CLKGEN_S_BASE CLB2_BASE
|
||||||
void CLB_TILE_CLKGEN_S_init();
|
void CLB_old_TILE_CLKGEN_S_init();
|
||||||
//
|
//
|
||||||
// Tile Configurations for all CLBs are in this file
|
// Tile Configurations for all CLBs are in this file
|
||||||
//
|
//
|
||||||
#include "clb_config.h"
|
#include <CLB/clb_config_old.h>
|
||||||
|
|
||||||
//*****************************************************************************
|
//*****************************************************************************
|
||||||
//
|
//
|
||||||
// CLBOUTPUTXBAR Configurations
|
// CLBOUTPUTXBAR Configurations
|
||||||
//
|
//
|
||||||
//*****************************************************************************
|
//*****************************************************************************
|
||||||
void CLB_OUTPUTXBAR_CLKGEN_CLK_M_init();
|
void CLB_old_OUTPUTXBAR_CLKGEN_CLK_M_init();
|
||||||
#define CLB_OUTPUTXBAR_CLKGEN_CLK_M XBAR_OUTPUT6
|
#define CLB_OUTPUTXBAR_CLKGEN_CLK_M XBAR_OUTPUT6
|
||||||
#define CLB_OUTPUTXBAR_CLKGEN_CLK_M_ENABLED_MUXES (XBAR_MUX00)
|
#define CLB_OUTPUTXBAR_CLKGEN_CLK_M_ENABLED_MUXES (XBAR_MUX00)
|
||||||
void CLB_OUTPUTXBAR_CLKGEN_CLK_S_init();
|
void CLB_old_OUTPUTXBAR_CLKGEN_CLK_S_init();
|
||||||
#define CLB_OUTPUTXBAR_CLKGEN_CLK_S XBAR_OUTPUT7
|
#define CLB_OUTPUTXBAR_CLKGEN_CLK_S XBAR_OUTPUT7
|
||||||
#define CLB_OUTPUTXBAR_CLKGEN_CLK_S_ENABLED_MUXES (XBAR_MUX08)
|
#define CLB_OUTPUTXBAR_CLKGEN_CLK_S_ENABLED_MUXES (XBAR_MUX08)
|
||||||
|
|
||||||
@ -108,10 +108,10 @@ void CLB_OUTPUTXBAR_CLKGEN_CLK_S_init();
|
|||||||
// Board Configurations
|
// Board Configurations
|
||||||
//
|
//
|
||||||
//*****************************************************************************
|
//*****************************************************************************
|
||||||
void Board_init();
|
void Boardold__init();
|
||||||
void CLB_init();
|
void CLB_old_init();
|
||||||
void CLB_OUTPUTXBAR_init();
|
void CLB_old_OUTPUTXBAR_init();
|
||||||
void PinMux_init();
|
void PinMux_old_init();
|
||||||
|
|
||||||
//*****************************************************************************
|
//*****************************************************************************
|
||||||
//
|
//
|
@ -2,10 +2,8 @@
|
|||||||
* ======== clb.c ========
|
* ======== clb.c ========
|
||||||
* DO NOT EDIT - This file is generated by the SysConfig tool.
|
* DO NOT EDIT - This file is generated by the SysConfig tool.
|
||||||
*/
|
*/
|
||||||
|
#include "clb_config_old.h"
|
||||||
#include "f28x_project.h"
|
#include "f28x_project.h"
|
||||||
//#include "driverlib.h"
|
|
||||||
//#include "device.h"
|
|
||||||
#include "clb_config.h"
|
|
||||||
#include "clb.h"
|
#include "clb.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user