ソースの整理4

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2879 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
(no author) 2009-07-21 10:48:09 +00:00
parent 3fd60792a2
commit ddc559677d
7 changed files with 17 additions and 143 deletions

View File

@ -24,16 +24,16 @@ TWL_CODEGEN ?= ALL
#----------------------------------------------------------------------------
SRCDIR += ./src ../../common/ARM7/src
SRCDIR += ./src
SRCS = main.c initScfg.c kami_pxi.c formatter.c mcu_firm.c
SRCS = main.c initScfg.c kami_pxi.c
TARGET_NAME = racoon
TARGET_NEF = $(TARGET_NAME).tef
LCFILE_SPEC = $(TARGET_NAME).lsf
LCFILE_TEMPLATE = $(ROOT)/build/components/$(TARGET_NAME).TWL/$(TARGET_NAME).lcf.template
LDRES_TEMPLATE = $(ROOT)/build/components/$(TARGET_NAME).TWL/$(TARGET_NAME).response.template
LCFILE_TEMPLATE = $(ROOT)/build/components/$(TARGET_NAME).TWL/$(TARGET_NAME).lcf.template
LDRES_TEMPLATE = $(ROOT)/build/components/$(TARGET_NAME).TWL/$(TARGET_NAME).response.template
CRT0_O = crt0.LTD.TWL.o
@ -60,12 +60,11 @@ LLIBRARY_DIRS += $(TWL_IPL_RED_ROOT)/lib/ARM7-TS/$(TWL_BUILD_DIR) \
LINCLUDES += $(ROOT)/build/libraries/spi/ARM7/include \
$(ROOT)/build/libraries/os/common/include \
$(TWL_IPL_RED_ROOT)/include \
../common/include \
$(ROOT)/build/libraries/init/common/include \
../../common/ARM7/include \
$(ROOT)/build/libraries/fatfs/ARM7.TWL/include \
$(ROOT)/build/libraries/fatfs/ARM7.TWL/include/fatfs \
$(ROOT)/build/libraries/fatfs/ARM7.TWL/include/twl/fatfs/ARM7
$(ROOT)/build/libraries/fatfs/ARM7.TWL/include/twl/fatfs/ARM7 \
../common/include
#LLIBRARIES += libwl_sp.TWL.LTD.a libsdio_hcd_twl$(TWL_LIBSUFFIX).a libsdio_busdriver$(TWL_LIBSUFFIX).a libsdio_lib$(TWL_LIBSUFFIX).a libARM7athdrv$(TWL_LIBSUFFIX).a

View File

@ -68,8 +68,6 @@ Autoload WRAM
Object * (.ltdwram)
Object $(OBJDIR)/main.o
Object $(OBJDIR)/kami_pxi.o
Object $(OBJDIR)/formatter.o
Object $(OBJDIR)/mcu_firm.o
# caches in fatfs library, that should be on WRAM.
# 2007/12/11 OBJECT() による .bss シンボルのリンクがうまくいかないので、

View File

@ -20,20 +20,19 @@
#include "kami_pxi.h"
#include "fifo.h"
#include "twl/cdc.h"
#include "formatter.h"
#include "mcu_firm.h"
#include <twl/ltdmain_begin.h>
#include <twl/mcu.h>
#include <twl/camera.h>
#include <twl/camera/ARM7/i2c_sharp.h>
#include <twl/camera/ARM7/i2c_micron.h>
#include <twl/sdmc.h>
typedef unsigned char byte; /* Don't change */
typedef unsigned short word; /* Don't change */
typedef unsigned long dword; /* Don't change */
#define BOOLEAN int
extern BOOL FATFSi_nandRtfsIo( int driveno, dword block, void* buffer, word count, BOOLEAN reading);
extern BOOL sdmcFormatNandLog( BOOL verify_flag);
extern void sdmcGetCID( SDMC_PORT_NO port, u32* dest);
/*---------------------------------------------------------------------------*
è<EFBFBD>è`
@ -187,20 +186,6 @@ static void KamiThread(void *arg)
(void)OS_ReceiveMessage(&kamiWork.msgQ, &msg, OS_MESSAGE_BLOCK);
switch (kamiWork.command)
{
case KAMI_EXE_FORMAT:
{
result = ExeFormat((FormatMode)kamiWork.data[0]); // Quick or Full
if (result)
{
KamiReturnResult(kamiWork.command, KAMI_PXI_RESULT_SUCCESS_TRUE);
}
else
{
KamiReturnResult(kamiWork.command, KAMI_PXI_RESULT_SUCCESS_FALSE);
}
}
break;
case KAMI_NAND_IO:
{
BOOL is_read;
@ -225,78 +210,6 @@ static void KamiThread(void *arg)
}
break;
case KAMI_MCU_WRITE_FIRM:
{
void* buffer;
KAMI_UNPACK_U32((u32 *)(&buffer), &kamiWork.data[1]);
if ( MCU_WriteFirm( buffer ) )
{
KamiReturnResult(kamiWork.command, KAMI_PXI_RESULT_SUCCESS);
}
else
{
KamiReturnResult(kamiWork.command, KAMI_PXI_RESULT_SUCCESS_FALSE);
}
}
break;
case KAMI_MCU_IO:
{
BOOL is_read;
u32 reg_no;
u32 write;
u32 read;
is_read = (BOOL)kamiWork.data[0];
KAMI_UNPACK_U32(&reg_no, &kamiWork.data[1]);
KAMI_UNPACK_U32(&write, &kamiWork.data[5]);
if (is_read)
{
read = MCU_ReadRegister( (u8)reg_no );
KamiReturnResultEx(kamiWork.command, KAMI_PXI_RESULT_SUCCESS, sizeof(u8), (u8*)&read );
}
else
{
MCU_WriteRegister( (u8)reg_no, (u8)write );
KamiReturnResult(kamiWork.command, KAMI_PXI_RESULT_SUCCESS);
}
}
break;
case KAMI_ARM7_IO:
{
BOOL is_read;
u32 addr;
u32 write;
u32 read;
is_read = (BOOL)kamiWork.data[0];
KAMI_UNPACK_U32(&addr, &kamiWork.data[1]);
KAMI_UNPACK_U32(&write, &kamiWork.data[5]);
if (is_read)
{
read = *(u32 *)addr;
KamiReturnResultEx(kamiWork.command, KAMI_PXI_RESULT_SUCCESS, sizeof(u32), (u8*)&read );
}
else
{
*(u32 *)addr = write;
KamiReturnResult(kamiWork.command, KAMI_PXI_RESULT_SUCCESS);
}
}
break;
case KAMI_CDC_GO_DSMODE:
{
CDC_Init(); // IIRなどのパラメータ初期化のため
CDC_GoDsMode();
KamiReturnResult(kamiWork.command, KAMI_PXI_RESULT_SUCCESS);
}
break;
case KAMI_CLEAR_NAND_ERRORLOG:
{
if (sdmcFormatNandLog(TRUE))
@ -310,45 +223,6 @@ static void KamiThread(void *arg)
}
break;
case KAMI_GET_CAMERA_MODULE_TYPE:
{
CameraModuleTypes types;
if (CAMERAi_IsSharpModule(CAMERA_SELECT_IN))
{
types.in = CAMERA_MODULE_TYPE_SHARP;
}
else if (CAMERAi_IsMicronModule(CAMERA_SELECT_IN))
{
types.in = CAMERA_MODULE_TYPE_MICRON;
}
else
{
types.in = CAMERA_MODULE_TYPE_UNKNOWN;
}
if (CAMERAi_IsSharpModule(CAMERA_SELECT_OUT))
{
types.out = CAMERA_MODULE_TYPE_SHARP;
}
else if (CAMERAi_IsMicronModule(CAMERA_SELECT_OUT))
{
types.out = CAMERA_MODULE_TYPE_MICRON;
}
else
{
types.out = CAMERA_MODULE_TYPE_UNKNOWN;
}
KamiReturnResultEx(kamiWork.command, KAMI_PXI_RESULT_SUCCESS, sizeof(CameraModuleTypes), (u8*)&types);
}
break;
case KAMI_GET_NAND_CID:
{
u8 buffer[16];
sdmcGetCID( SDMC_PORT_NAND, (u32*)buffer);
KamiReturnResultEx(kamiWork.command, KAMI_PXI_RESULT_SUCCESS, sizeof(buffer), (u8*)buffer );
}
break;
default:
KamiReturnResult(kamiWork.command, KAMI_PXI_RESULT_INVALID_COMMAND);
}

View File

@ -33,11 +33,9 @@ SRCS = main.c \
kami_write_nandfirm.c \
LINCLUDES = ../common/include \
$(ROOT)/build/libraries/lcfg/ARM9.TWL/include \
../../common/ARM9/include
$(ROOT)/build/libraries/lcfg/ARM9.TWL/include
SRCDIR = src \
../../common/ARM9/src
SRCDIR = src
#----------------------------------------------------------------------------

View File

@ -62,6 +62,12 @@ NORHeaderDS;
*---------------------------------------------------------------------------*/
BOOL NandfirmProcess(void);
static inline void MakeFullPathForSD(char* file_name, char* full_path)
{
STD_CopyString( full_path, "sdmc:/" );
STD_ConcatenateString( full_path, file_name );
}
/*===========================================================================*/
#ifdef __cplusplus

View File

@ -23,7 +23,6 @@
#include <nitro/nvram.h>
#include <../build/libraries/spi/ARM9/include/spi.h>
#include "common_utility.h"
#include "kami_write_nandfirm.h"
#include "kami_pxi.h"