rvtr/ctr_eFuse
1
Fork 0
mirror of https://github.com/rvtr/ctr_eFuse.git synced 2025-11-02 00:11:04 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

初期化の時もエラーバッファを引数に取るよう変更。

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_eFuse@91 ff987cc8-cf2f-4642-8568-d52cce064691
This commit is contained in:
kubodera_yuichi 2009-12-25 01:55:36 +00:00
parent 4589b6b330
commit 8fca7addd9
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cr_generate_id.c
View File

@ -133,14 +133,24 @@ static u64 generatingCount = 0; // 現在生成中のID(起動時からの通算
int cr_print_flag = 0; int cr_print_flag = 0;
// generate_id関数のイニシャライズ // generate_id関数のイニシャライズ
int cr_generate_id_initialize( void ) int cr_generate_id_initialize( u8 id_buf[CR_ID_BUF_SIZE] )
{ {
int ret_code = CR_GENID_SUCCESS; int ret_code = CR_GENID_SUCCESS;
// 生成カウンタの初期化
generatingCount = 0;
#ifdef USE_HSM #ifdef USE_HSM
ret_code = hsm_initialize(); ret_code = hsm_initialize();
if ( ret_code != CR_GENID_SUCCESS ) if ( ret_code != CR_GENID_SUCCESS )
{ {
CR_ERR_BUFFER *cr_err_buf = (CR_ERR_BUFFER *)id_buf;
memset( cr_err_buf, 0, sizeof( CR_ERR_BUFFER ) );
cr_err_buf->errorCode = ret_code;
GetErrorInfo( cr_err_buf->callStack, &cr_err_buf->recordSize );
#ifdef DEBUG_PRINT
printf( "CALL_STACK : %s\n", cr_err_buf->callStack );
#endif
return 0; return 0;
} }
#endif #endif

2
cr_generate_id.h
View File

@ -201,7 +201,7 @@ typedef unsigned long long u64;
#define CR_ID1_MASK 0x00000003FFFFFFFFll // 34bit #define CR_ID1_MASK 0x00000003FFFFFFFFll // 34bit
#define CR_ID2_MASK 0xFFFFFFFFFFFFFFFFll // 64bit #define CR_ID2_MASK 0xFFFFFFFFFFFFFFFFll // 64bit
extern int cr_generate_id_initialize( void ); extern int cr_generate_id_initialize( u8 id[CR_ID_BUF_SIZE] );
extern int cr_generate_id( u32 serial[CR_NUM_OF_SERIAL], u8 id[CR_ID_BUF_SIZE], u8 bondingOption ); extern int cr_generate_id( u32 serial[CR_NUM_OF_SERIAL], u8 id[CR_ID_BUF_SIZE], u8 bondingOption );
extern int cr_generate_id_finalize( void ); extern int cr_generate_id_finalize( void );

5
main.c
View File

@ -201,9 +201,10 @@ int main(int ac, char *argv[])
counter2 = 0x0000000000000000ll; counter2 = 0x0000000000000000ll;
// cr_generate_id を使用する前に呼び出す // cr_generate_id を使用する前に呼び出す
if ( !cr_generate_id_initialize() ) ret_code = cr_generate_id_initialize( id );
if ( ret_code != CR_GENID_INITIALIZE_OK )
{ {
printf( "error : cr_generate_id_initialize()\n" ); printf( "error(%d) : cr_generate_id_initialize\n", ret_code );
return 0; // error return 0; // error
} }