diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-08-08 22:22:24 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-08-08 22:22:24 +0000 |
| commit | 8eb7408ab32c29f7cd255f7d908643c73fa17345 (patch) | |
| tree | 70198f81253f24c9ab81829971b8cc12157c99d8 | |
| parent | b46f82a8ef7621081e65964662bd9b7eb0006951 (diff) | |
update Octasic API headers (but not code yet) to PR43, and use version with GPL licenses instead of proprietary licenses
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@1262 5390a7c7-147a-4af0-8ec9-7488f05a26cb
48 files changed, 488 insertions, 344 deletions
diff --git a/include/apilib/octapi_bt0.h b/include/apilib/octapi_bt0.h index a7dd534..72783b6 100644 --- a/include/apilib/octapi_bt0.h +++ b/include/apilib/octapi_bt0.h @@ -1,30 +1,39 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ -File: octapi_bt0.h +File: octapi_bt0.h -Copyright (c) 2001 Octasic Inc. All rights reserved. + Copyright (c) 2001-2006 Octasic Inc. Description: -This source code is Octasic Confidential. Use of and access to this code -is covered by the Octasic Device Enabling Software License Agreement. -Acknowledgement of the Octasic Device Enabling Software License was -required for access to this code. A copy was also provided with the release. + Library used to manage a binary tree of variable max size. Library is + made to use one block of contiguous memory to manage the tree. +This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API is +free software; you can redistribute it and/or modify it under the terms of +the GNU General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. -$Octasic_Release: OCT610xAPI-01.00-PR37 $ +The OCT6100 GPL API is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -$Octasic_Revision: 10 $ +You should have received a copy of the GNU General Public License +along with the OCT6100 GPL API; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +$Octasic_Release: OCT612xAPI-01.00-PR43 $ + +$Octasic_Revision: 11 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTAPI_BT0_H__ #define __OCTAPI_BT0_H__ - #include "octdef.h" - -#define OCTAPI_BT0_BASE 0xFFFF0000 +#define OCTAPI_BT0_BASE 0xFFFF0000 #define OCTAPI_BT0_KEY_SIZE_NOT_MUTLIPLE_OF_UINT32 OCTAPI_BT0_BASE+0x0001 #define OCTAPI_BT0_DATA_SIZE_NOT_MUTLIPLE_OF_UINT32 OCTAPI_BT0_BASE+0x0002 #define OCTAPI_BT0_MALLOC_FAILED OCTAPI_BT0_BASE+0x0003 @@ -32,39 +41,35 @@ $Octasic_Revision: 10 $ #define OCTAPI_BT0_KEY_ALREADY_IN_TREE OCTAPI_BT0_BASE+0x0005 #define OCTAPI_BT0_KEY_NOT_IN_TREE OCTAPI_BT0_BASE+0x0006 -/* Possible result for Find Or Add function.*/ -#define OCTAPI0_BT0_NODE_FOUND 0 -#define OCTAPI0_BT0_NODE_ADDDED 1 +/* Possible result for Find Or Add function. */ +#define OCTAPI0_BT0_NODE_FOUND 0 +#define OCTAPI0_BT0_NODE_ADDDED 1 #define OCTAPI_BT0_NO_SMALLER_KEY 0xAAAAAAAA - #ifdef __cplusplus extern "C" { -#endif /* __cplusplus*/ +#endif /* __cplusplus */ #define octapi_bt0_get_size( number_of_items, key_size, data_size, b_size ) OctApiBt0GetSize( (UINT32) number_of_items,(UINT32) key_size, (UINT32) data_size, (PUINT32) b_size ) -#define octapi_bt0_init(b, number_of_items, key_size, data_size) OctApiBt0Init( (void **) b,(UINT32) number_of_items,(UINT32) key_size, (UINT32) data_size ) +#define octapi_bt0_init( b, number_of_items, key_size, data_size ) OctApiBt0Init( (void **) b,(UINT32) number_of_items,(UINT32) key_size, (UINT32) data_size ) #define octapi_bt0_add_node( b, key, data ) OctApiBt0AddNode( (void *) b,(void *) key,(void **) data ) #define octapi_bt0_remove_node( b, key ) OctApiBt0RemoveNode( (void *) b,(void *) key ) #define octapi_bt0_query_node( b, key, data ) OctApiBt0QueryNode( (void *) b,(void *) key,(void **) data ) -#define octapi_bt0_get_first_node( b,key, data ) OctApiBt0GetFirstNode( (void *) b,(void **) key, (void **) data ) - +#define octapi_bt0_get_first_node( b, key, data ) OctApiBt0GetFirstNode( (void *) b,(void **) key, (void **) data ) -static UINT32 OctApiBt0GetSize( UINT32 number_of_items,UINT32 key_size, UINT32 data_size, UINT32 * b_size ); -static UINT32 OctApiBt0Init( void ** b,UINT32 number_of_items,UINT32 key_size, UINT32 data_size ); -UINT32 OctApiBt0AddNode( void * b,void * key,void ** data ); -UINT32 OctApiBt0RemoveNode( void * b,void * key ); -UINT32 OctApiBt0QueryNode( void * b,void * key,void ** data ); -UINT32 OctApiBt0GetFirstNode( void * b,void ** key, void ** data ); -UINT32 OctApiBt0FindOrAddNode(void * b,void * key,void ** data, UINT32 *fnct_result); +static UINT32 OctApiBt0GetSize( UINT32 number_of_items, UINT32 key_size, UINT32 data_size, UINT32 * b_size ); +static UINT32 OctApiBt0Init( void ** b, UINT32 number_of_items, UINT32 key_size, UINT32 data_size ); +UINT32 OctApiBt0AddNode( void * b, void * key, void ** data ); +UINT32 OctApiBt0RemoveNode( void * b, void * key ); +UINT32 OctApiBt0QueryNode( void * b, void * key, void ** data ); +UINT32 OctApiBt0GetFirstNode( void * b, void ** key, void ** data ); +UINT32 OctApiBt0FindOrAddNode( void * b, void * key, void ** data, UINT32 *fnct_result ); -UINT32 OctApiBt0AddNodeReportPrevNodeData(void * b,void * key,void ** data, void ** prev_data, UINT32 *fnct_result ); +UINT32 OctApiBt0AddNodeReportPrevNodeData( void * b, void * key, void ** data, void ** prev_data, UINT32 *fnct_result ); #ifdef __cplusplus } -#endif /* __cplusplus*/ - - +#endif /* __cplusplus */ #endif /*__OCTAPI_BT0_H__*/ diff --git a/include/apilib/octapi_largmath.h b/include/apilib/octapi_largmath.h index dae120a..0f645df 100644 --- a/include/apilib/octapi_largmath.h +++ b/include/apilib/octapi_largmath.h @@ -1,49 +1,56 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ -File: octapi_largmath.h +File: octapi_largmath.h -Copyright (c) 2001 Octasic Inc. All rights reserved. + Copyright (c) 2001-2006 Octasic Inc. Description: -This source code is Octasic Confidential. Use of and access to this code -is covered by the Octasic Device Enabling Software License Agreement. -Acknowledgement of the Octasic Device Enabling Software License was -required for access to this code. A copy was also provided with the release. + Library used to perform arithmetic on integer values of an integer multiple + of 32-bits. +This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API is +free software; you can redistribute it and/or modify it under the terms of +the GNU General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. -$Octasic_Release: OCT610xAPI-01.00-PR37 $ +The OCT6100 GPL API is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -$Octasic_Revision: 5 $ +You should have received a copy of the GNU General Public License +along with the OCT6100 GPL API; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +$Octasic_Release: OCT612xAPI-01.00-PR43 $ + +$Octasic_Revision: 6 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTAPI_LARGMATH_H__ #define __OCTAPI_LARGMATH_H__ - - #include "octdef.h" +#define OCTAPI_LM_DIVISION_BY_ZERO 0xFFFF +#define OCTAPI_LM_OVERFLOW 0xFFFE +#define OCTAPI_LM_ARRAY_SIZE_MISMATCH 0xFFFD - -#define OCTAPI_LM_DIVISION_BY_ZERO 0xFFFF -#define OCTAPI_LM_OVERFLOW 0xFFFE -#define OCTAPI_LM_ARRAY_SIZE_MISMATCH 0xFFFD - -#define OCTAPI_LM_MAX_OPTIMIZE_MUL 10 +#define OCTAPI_LM_MAX_OPTIMIZE_MUL 10 #ifdef __cplusplus extern "C" { -#endif /* __cplusplus*/ - -#define octapi_lm_add( a, alen, b, blen, z, zlen) OctApiLmAdd( (PUINT32) a, (USHORT) alen, (PUINT32) b, (USHORT) blen, (PUINT32) z, (USHORT) zlen ) -#define octapi_lm_subtract( a, alen, bneg, blen, z, zlen, neg) OctApiLmSubtract( (PUINT32) a, (USHORT) alen, (PUINT32) bneg, (USHORT) blen, (PUINT32) z, (USHORT) zlen, (USHORT*) neg ) -#define octapi_lm_compare( a, alen, bneg, blen, neg) OctApiLmCompare( (PUINT32) a, (USHORT) alen, (PUINT32) bneg, (USHORT) blen, (USHORT*) neg ) -#define octapi_lm_multiply( a, b, ablen, z) OctApiLmMultiply( (PUINT32) a, (PUINT32) b, (USHORT) ablen, (PUINT32) z ) -#define octapi_lm_divide( n, d, q, r, ndqrlen) OctApiLmDivide( (PUINT32) n, (PUINT32) d, (PUINT32) q, (PUINT32) r, (USHORT) ndqrlen ) -#define octapi_lm_shiftright1( a, alen) OctApiLmShiftRight1( (PUINT32) a, (USHORT) alen ) -#define octapi_lm_shiftn( a, alen, shiftleft, shiftn) OctApiLmShiftn( (PUINT32) a, (USHORT) alen, (USHORT) shiftleft, (USHORT) shiftn ) -#define octapi_lm_getmsb( a, alen, msb_pos) OctApiLmGetMsb( (PUINT32) a, (USHORT) alen, (USHORT*) msb_pos ) +#endif /* __cplusplus */ + +#define octapi_lm_add( a, alen, b, blen, z, zlen ) OctApiLmAdd( (PUINT32) a, (USHORT) alen, (PUINT32) b, (USHORT) blen, (PUINT32) z, (USHORT) zlen ) +#define octapi_lm_subtract( a, alen, bneg, blen, z, zlen, neg ) OctApiLmSubtract( (PUINT32) a, (USHORT) alen, (PUINT32) bneg, (USHORT) blen, (PUINT32) z, (USHORT) zlen, (USHORT*) neg ) +#define octapi_lm_compare( a, alen, bneg, blen, neg ) OctApiLmCompare( (PUINT32) a, (USHORT) alen, (PUINT32) bneg, (USHORT) blen, (USHORT*) neg ) +#define octapi_lm_multiply( a, b, ablen, z ) OctApiLmMultiply( (PUINT32) a, (PUINT32) b, (USHORT) ablen, (PUINT32) z ) +#define octapi_lm_divide( n, d, q, r, ndqrlen ) OctApiLmDivide( (PUINT32) n, (PUINT32) d, (PUINT32) q, (PUINT32) r, (USHORT) ndqrlen ) +#define octapi_lm_shiftright1( a, alen ) OctApiLmShiftRight1( (PUINT32) a, (USHORT) alen ) +#define octapi_lm_shiftn( a, alen, shiftleft, shiftn ) OctApiLmShiftn( (PUINT32) a, (USHORT) alen, (USHORT) shiftleft, (USHORT) shiftn ) +#define octapi_lm_getmsb( a, alen, msb_pos ) OctApiLmGetMsb( (PUINT32) a, (USHORT) alen, (USHORT*) msb_pos ) static UINT32 OctApiLmAdd( PUINT32 a, USHORT alen, PUINT32 b, USHORT blen, PUINT32 z, USHORT zlen ); @@ -57,6 +64,6 @@ UINT32 OctApiLmGetMsb( PUINT32 a, USHORT alen, PUSHORT msb_pos ); #ifdef __cplusplus } -#endif /* __cplusplus*/ +#endif /* __cplusplus */ -#endif /*__OCTAPI_LARGMATH_H__*/ +#endif /* __OCTAPI_LARGMATH_H__ */ diff --git a/include/apilib/octapi_llman.h b/include/apilib/octapi_llman.h index 467ed9c..178019e 100644 --- a/include/apilib/octapi_llman.h +++ b/include/apilib/octapi_llman.h @@ -1,127 +1,142 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ -File: octapi_llman.h +File: octapi_llman.h -Copyright (c) 2001 Octasic Inc. All rights reserved. + Copyright (c) 2001-2006 Octasic Inc. -Description: +Description: -This source code is Octasic Confidential. Use of and access to this code -is covered by the Octasic Device Enabling Software License Agreement. -Acknowledgement of the Octasic Device Enabling Software License was -required for access to this code. A copy was also provided with the release. + Library used to manage allocation tables and linked lists. The library is + made such that only a block of contiguous memory is needed for the + management of the linked list/allocation table. +This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API is +free software; you can redistribute it and/or modify it under the terms of +the GNU General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. -$Octasic_Release: OCT610xAPI-01.00-PR37 $ +The OCT6100 GPL API is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -$Octasic_Revision: 7 $ +You should have received a copy of the GNU General Public License +along with the OCT6100 GPL API; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +$Octasic_Release: OCT612xAPI-01.00-PR43 $ + +$Octasic_Revision: 8 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ +#ifndef __OCTAPI_LLMAN_H__ +#define __OCTAPI_LLMAN_H__ + #include "octdef.h" -/* Error defines*/ -#define OCTAPI_LLM_MEMORY_NOT_ALLOCATED 0xFFFFFFFF -#define OCTAPI_LLM_NO_STRUCTURES_LEFT 0xFFFFFFFE -#define OCTAPI_LLM_BLOCKNUM_OUT_OF_RANGE 0xFFFFFFFD -#define OCTAPI_LLM_ELEMENT_ALREADY_ASSIGNED 0xFFFFFFFC -#define OCTAPI_LLM_ELEMENT_NOT_FOUND 0xFFFFFFFB -#define OCTAPI_LLM_LIST_EMPTY 0xFFFFFFFA -#define OCTAPI_LLM_INVALID_LIST_HANDLE 0xFFFFFFF9 -#define OCTAPI_LLM_TREE_NODE_ABSENT 0xFFFFFFF8 -#define OCTAPI_LLM_INTERNAL_ERROR0 0xFFFFFFF7 -#define OCTAPI_LLM_INTERNAL_ERROR1 0xFFFFFFF6 -#define OCTAPI_LLM_INVALID_PARAMETER 0xFFFFFFF5 - -#define OCTAPI_LLM2_MEMORY_NOT_ALLOCATED 0xFEFFFFFF -#define OCTAPI_LLM2_NO_STRUCTURES_LEFT 0xFEFFFFFE -#define OCTAPI_LLM2_BLOCKNUM_OUT_OF_RANGE 0xFEFFFFFD -#define OCTAPI_LLM2_ELEMENT_ALREADY_ASSIGNED 0xFEFFFFFC -#define OCTAPI_LLM2_ELEMENT_NOT_FOUND 0xFEFFFFFB -#define OCTAPI_LLM2_LIST_EMPTY 0xFEFFFFFA -#define OCTAPI_LLM2_INVALID_LIST_HANDLE 0xFEFFFFF9 -#define OCTAPI_LLM2_TREE_NODE_ABSENT 0xFEFFFFF8 -#define OCTAPI_LLM2_INTERNAL_ERROR0 0xFEFFFFF7 -#define OCTAPI_LLM2_INTERNAL_ERROR1 0xFEFFFFF6 -#define OCTAPI_LLM2_INVALID_PARAMETER 0xFEFFFFF5 - -/* Other defines*/ -#define OCTAPI_LLM_LIST_APPEND 0xFFFFFFFF -#define OCTAPI_LLM2_INSERT_ERROR 0xFFFFFFFF -#define OCTAPI_LLM2_INSERT_FIRST_NODE 0xFFFF0000 -#define OCTAPI_LLM2_INSERT_LIST_NODE 0xFFFF0001 -#define OCTAPI_LLM2_INSERT_LAST_NODE 0xFFFF0002 -#define OCTAPI_LLM2_INSERT_BEFORE_LAST_NODE 0xFFFF0003 -#define OCTAPI_LLM2_REMOVE_ERROR 0xFFFFFFFF -#define OCTAPI_LLM2_REMOVE_FIRST_NODE 0xFFFF0004 -#define OCTAPI_LLM2_REMOVE_LIST_NODE 0xFFFF0005 -#define OCTAPI_LLM2_REMOVE_LAST_NODE 0xFFFF0006 -#define OCTAPI_LLM2_REMOVE_BEFORE_LAST_NODE 0xFFFF0007 +/* Error defines. */ +#define OCTAPI_LLM_MEMORY_NOT_ALLOCATED 0xFFFFFFFF +#define OCTAPI_LLM_NO_STRUCTURES_LEFT 0xFFFFFFFE +#define OCTAPI_LLM_BLOCKNUM_OUT_OF_RANGE 0xFFFFFFFD +#define OCTAPI_LLM_ELEMENT_ALREADY_ASSIGNED 0xFFFFFFFC +#define OCTAPI_LLM_ELEMENT_NOT_FOUND 0xFFFFFFFB +#define OCTAPI_LLM_LIST_EMPTY 0xFFFFFFFA +#define OCTAPI_LLM_INVALID_LIST_HANDLE 0xFFFFFFF9 +#define OCTAPI_LLM_TREE_NODE_ABSENT 0xFFFFFFF8 +#define OCTAPI_LLM_INTERNAL_ERROR0 0xFFFFFFF7 +#define OCTAPI_LLM_INTERNAL_ERROR1 0xFFFFFFF6 +#define OCTAPI_LLM_INVALID_PARAMETER 0xFFFFFFF5 + +#define OCTAPI_LLM2_MEMORY_NOT_ALLOCATED 0xFEFFFFFF +#define OCTAPI_LLM2_NO_STRUCTURES_LEFT 0xFEFFFFFE +#define OCTAPI_LLM2_BLOCKNUM_OUT_OF_RANGE 0xFEFFFFFD +#define OCTAPI_LLM2_ELEMENT_ALREADY_ASSIGNED 0xFEFFFFFC +#define OCTAPI_LLM2_ELEMENT_NOT_FOUND 0xFEFFFFFB +#define OCTAPI_LLM2_LIST_EMPTY 0xFEFFFFFA +#define OCTAPI_LLM2_INVALID_LIST_HANDLE 0xFEFFFFF9 +#define OCTAPI_LLM2_TREE_NODE_ABSENT 0xFEFFFFF8 +#define OCTAPI_LLM2_INTERNAL_ERROR0 0xFEFFFFF7 +#define OCTAPI_LLM2_INTERNAL_ERROR1 0xFEFFFFF6 +#define OCTAPI_LLM2_INVALID_PARAMETER 0xFEFFFFF5 + +/* Other defines. */ +#define OCTAPI_LLM_LIST_APPEND 0xFFFFFFFF +#define OCTAPI_LLM2_INSERT_ERROR 0xFFFFFFFF +#define OCTAPI_LLM2_INSERT_FIRST_NODE 0xFFFF0000 +#define OCTAPI_LLM2_INSERT_LIST_NODE 0xFFFF0001 +#define OCTAPI_LLM2_INSERT_LAST_NODE 0xFFFF0002 +#define OCTAPI_LLM2_INSERT_BEFORE_LAST_NODE 0xFFFF0003 +#define OCTAPI_LLM2_REMOVE_ERROR 0xFFFFFFFF +#define OCTAPI_LLM2_REMOVE_FIRST_NODE 0xFFFF0004 +#define OCTAPI_LLM2_REMOVE_LIST_NODE 0xFFFF0005 +#define OCTAPI_LLM2_REMOVE_LAST_NODE 0xFFFF0006 +#define OCTAPI_LLM2_REMOVE_BEFORE_LAST_NODE 0xFFFF0007 #ifdef __cplusplus extern "C" { -#endif /* __cplusplus*/ - -#define octapi_llm_alloc_get_size( number_of_items, l_size) OctapiLlmAllocGetSize( (UINT32) number_of_items,(PUINT32) l_size ) -#define octapi_llm_alloc_init( l, number_of_items) OctapiLlmAllocInit( (PVOID*) l,(UINT32) number_of_items) -#define octapi_llm_alloc_info( l, allocated_items, available_items) OctapiLlmAllocInfo( (PVOID) l, (PUINT32) allocated_items, (PUINT32) available_items ) -#define octapi_llm_alloc_alloc( l, blocknum) OctapiLlmAllocAlloc( (PVOID) l, (PUINT32) blocknum ) -#define octapi_llm_alloc_dealloc( l, blocknum) OctapiLlmAllocDealloc( (PVOID) l,(UINT32) blocknum ) -#define octapi_llm_list_get_size( number_of_items, number_of_lists, user_info_size, l_size) OctApiLlmListGetSize( (UINT32) number_of_items,(UINT32) number_of_lists,(UINT32) user_info_size,(PUINT32) l_size ) -#define octapi_llm_list_init( l, number_of_items, number_of_lists, user_info_size) OctApiLlmListInit( (PVOID*) l,(UINT32) number_of_items,(UINT32) number_of_lists,(UINT32) user_info_size ) +#endif /* __cplusplus */ + +#define octapi_llm_alloc_get_size( number_of_items, l_size ) OctapiLlmAllocGetSize( (UINT32) number_of_items,(PUINT32) l_size ) +#define octapi_llm_alloc_init( l, number_of_items ) OctapiLlmAllocInit( (PVOID*) l,(UINT32) number_of_items ) +#define octapi_llm_alloc_info( l, allocated_items, available_items ) OctapiLlmAllocInfo( (PVOID) l, (PUINT32) allocated_items, (PUINT32) available_items ) +#define octapi_llm_alloc_alloc( l, blocknum ) OctapiLlmAllocAlloc( (PVOID) l, (PUINT32) blocknum ) +#define octapi_llm_alloc_dealloc( l, blocknum ) OctapiLlmAllocDealloc( (PVOID) l,(UINT32) blocknum ) +#define octapi_llm_list_get_size( number_of_items, number_of_lists, user_info_size, l_size ) OctApiLlmListGetSize( (UINT32) number_of_items,(UINT32) number_of_lists,(UINT32) user_info_size,(PUINT32) l_size ) +#define octapi_llm_list_init( l, number_of_items, number_of_lists, user_info_size ) OctApiLlmListInit( (PVOID*) l,(UINT32) number_of_items,(UINT32) number_of_lists,(UINT32) user_info_size ) #define octapi_llm_list_info( l, allocated_lists, allocated_items, free_lists, free_items ) OctApiLlmListInfo( (PVOID) l,(PUINT32) allocated_lists,(PUINT32) allocated_items,(PUINT32) free_lists,(PUINT32) free_items ) -#define octapi_llm_list_create( l, list_handle) OctApiLlmListCreate( (PVOID) l,(PUINT32) list_handle ) -#define octapi_llm_list_create_full( l, list_length, plist_handle) OctApiLlmListCreateFull( (PVOID) l, (UINT32) list_length, (PUINT32) plist_handle ) -#define octapi_llm_list_append_items( l, list_handle, num_items) OctApiLlmListAppendItems( (PVOID) l, (UINT32) list_handle, (UINT32) num_items ) -#define octapi_llm_list_append_and_set_items( l, list_handle, num_items, data_list) OctApiLlmListAppendAndSetItems( (PVOID) l, (UINT32) list_handle, (UINT32) num_items, (PVOID) data_list ) +#define octapi_llm_list_create( l, list_handle ) OctApiLlmListCreate( (PVOID) l,(PUINT32) list_handle ) +#define octapi_llm_list_create_full( l, list_length, plist_handle ) OctApiLlmListCreateFull( (PVOID) l, (UINT32) list_length, (PUINT32) plist_handle ) +#define octapi_llm_list_append_items( l, list_handle, num_items ) OctApiLlmListAppendItems( (PVOID) l, (UINT32) list_handle, (UINT32) num_items ) +#define octapi_llm_list_append_and_set_items( l, list_handle, num_items, data_list ) OctApiLlmListAppendAndSetItems( (PVOID) l, (UINT32) list_handle, (UINT32) num_items, (PVOID) data_list ) #define octapi_llm_list_delete( l, list_handle ) OctApiLlmListDelete( (PVOID) l,(UINT32) list_handle ) -#define octapi_llm_list_length( l, list_handle, number_of_items_in_list) OctApiLlmListLength( (PVOID) l,(UINT32) list_handle, (PUINT32) number_of_items_in_list ) -#define octapi_llm_list_insert_item( l, list_handle, item_number, item_data_pnt) OctApiLlmListInsertItem( (PVOID) l,(UINT32) list_handle,(UINT32) item_number,(PVOID*) item_data_pnt ) -#define octapi_llm_list_remove_item( l, list_handle, item_number) OctApiLlmListRemoveItem( (PVOID) l,(UINT32) list_handle,(UINT32) item_number ) -#define octapi_llm_list_item_data( l, list_handle, item_number, item_data_pnt) OctApiLlmListItemData( (PVOID) l,(UINT32) list_handle,(UINT32) item_number,(PVOID*) item_data_pnt ) -#define octapi_llm_list_copy_data( l, list_handle, start_item, data_length, pdata_list) OctApiLlmListCopyData( (PVOID) l, (UINT32) list_handle, (UINT32) start_item, (UINT32) data_length, (PVOID) pdata_list ) -#define octapi_llm_list_set_items( l, list_handle, start_item, data_length, pdata_list) OctApiLlmListSetItems( (PVOID) l, (UINT32) list_handle, (UINT32) start_item, (UINT32) data_length, (PVOID) pdata_list ) - - -/* Alloc man.*/ +#define octapi_llm_list_length( l, list_handle, number_of_items_in_list ) OctApiLlmListLength( (PVOID) l,(UINT32) list_handle, (PUINT32) number_of_items_in_list ) +#define octapi_llm_list_insert_item( l, list_handle, item_number, item_data_pnt ) OctApiLlmListInsertItem( (PVOID) l,(UINT32) list_handle,(UINT32) item_number,(PVOID*) item_data_pnt ) +#define octapi_llm_list_remove_item( l, list_handle, item_number ) OctApiLlmListRemoveItem( (PVOID) l,(UINT32) list_handle,(UINT32) item_number ) +#define octapi_llm_list_item_data( l, list_handle, item_number, item_data_pnt ) OctApiLlmListItemData( (PVOID) l,(UINT32) list_handle,(UINT32) item_number,(PVOID*) item_data_pnt ) +#define octapi_llm_list_copy_data( l, list_handle, start_item, data_length, pdata_list ) OctApiLlmListCopyData( (PVOID) l, (UINT32) list_handle, (UINT32) start_item, (UINT32) data_length, (PVOID) pdata_list ) +#define octapi_llm_list_set_items( l, list_handle, start_item, data_length, pdata_list ) OctApiLlmListSetItems( (PVOID) l, (UINT32) list_handle, (UINT32) start_item, (UINT32) data_length, (PVOID) pdata_list ) + +/* Alloc man. */ static UINT32 OctapiLlmAllocGetSize( UINT32 number_of_items,PUINT32 l_size ); -static UINT32 OctapiLlmAllocInit( PVOID* l,UINT32 number_of_items); +static UINT32 OctapiLlmAllocInit( PVOID* l,UINT32 number_of_items ); static UINT32 OctapiLlmAllocInfo( PVOID l, PUINT32 allocated_items, PUINT32 available_items ); static UINT32 OctapiLlmAllocAlloc( PVOID l, PUINT32 blocknum ); static UINT32 OctapiLlmAllocDealloc( PVOID l,UINT32 blocknum ); -/* Time managed alloc man.*/ +/* Time managed alloc man. */ UINT32 OctApiTllmAllocGetSize( UINT32 number_of_items, PUINT32 l_size ); UINT32 OctApiTllmAllocInit( PVOID* l, UINT32 number_of_items ); UINT32 OctApiTllmAllocInfo( PVOID l, PUINT32 allocated_items, PUINT32 available_items ); UINT32 OctApiTllmAllocAlloc( PVOID l, PUINT32 blocknum, UINT32 current_time[2] ); UINT32 OctApiTllmAllocDealloc( PVOID l, UINT32 blocknum, UINT32 timeout_value, UINT32 current_time[2] ); -/* List man.*/ -UINT32 OctApiLlmListGetSize( UINT32 number_of_items,UINT32 number_of_lists,UINT32 user_info_size,PUINT32 l_size ); -UINT32 OctApiLlmListInit( PVOID* l,UINT32 number_of_items,UINT32 number_of_lists,UINT32 user_info_size ); -UINT32 OctApiLlmListInfo( PVOID l,PUINT32 allocated_lists,PUINT32 allocated_items,PUINT32 free_lists,PUINT32 free_items ); -UINT32 OctApiLlmListCreate( PVOID l,PUINT32 list_handle ); +/* List man. */ +UINT32 OctApiLlmListGetSize( UINT32 number_of_items, UINT32 number_of_lists, UINT32 user_info_size, PUINT32 l_size ); +UINT32 OctApiLlmListInit( PVOID* l, UINT32 number_of_items, UINT32 number_of_lists, UINT32 user_info_size ); +UINT32 OctApiLlmListInfo( PVOID l, PUINT32 allocated_lists, PUINT32 allocated_items, PUINT32 free_lists, PUINT32 free_items ); +UINT32 OctApiLlmListCreate( PVOID l, PUINT32 list_handle ); UINT32 OctApiLlmListCreateFull( PVOID l, UINT32 list_length, UINT32* plist_handle ); UINT32 OctApiLlmListAppendItems( PVOID l, UINT32 list_handle, UINT32 num_items ); UINT32 OctApiLlmListAppendAndSetItems( PVOID l, UINT32 list_handle, UINT32 num_items, PVOID data_list ); -UINT32 OctApiLlmListDelete( PVOID l,UINT32 list_handle ); -UINT32 OctApiLlmListLength( PVOID l,UINT32 list_handle, PUINT32 number_of_items_in_list ); -UINT32 OctApiLlmListInsertItem( PVOID l,UINT32 list_handle,UINT32 item_number,PVOID* item_data_pnt ); -UINT32 OctApiLlmListRemoveItem( PVOID l,UINT32 list_handle,UINT32 item_number ); -UINT32 OctApiLlmListItemData( PVOID l,UINT32 list_handle,UINT32 item_number,PVOID* item_data_pnt ); +UINT32 OctApiLlmListDelete( PVOID l, UINT32 list_handle ); +UINT32 OctApiLlmListLength( PVOID l, UINT32 list_handle, PUINT32 number_of_items_in_list ); +UINT32 OctApiLlmListInsertItem( PVOID l, UINT32 list_handle, UINT32 item_number, PVOID* item_data_pnt ); +UINT32 OctApiLlmListRemoveItem( PVOID l, UINT32 list_handle, UINT32 item_number ); +UINT32 OctApiLlmListItemData( PVOID l, UINT32 list_handle, UINT32 item_number, PVOID* item_data_pnt ); UINT32 OctApiLlmListCopyData( PVOID l, UINT32 list_handle, UINT32 start_item, UINT32 data_length, PVOID pdata_list ); UINT32 OctApiLlmListSetItems( PVOID l, UINT32 list_handle, UINT32 start_item, UINT32 data_length, PVOID pdata_list ); -/* Second list manager using a key to order info in the list.*/ -UINT32 OctApiLlm2ListGetSize( UINT32 number_of_items,UINT32 number_of_lists,UINT32 user_info_size,PUINT32 l_size ); -UINT32 OctApiLlm2ListInit( PVOID* l,UINT32 number_of_items,UINT32 number_of_lists,UINT32 user_info_size ); -UINT32 OctApiLlm2ListCreate( PVOID l,PUINT32 list_handle ); -UINT32 OctApiLlm2ListLength( PVOID l,UINT32 list_handle, PUINT32 number_of_items_in_list ); -UINT32 OctApiLlm2ListInsertItem(void * l,UINT32 list_handle,UINT32 item_key,void ** item_data_pnt, void ** prev_item_data_pnt, void ** prev_prev_item_data_pnt, PUINT32 insert_status_pnt ); -UINT32 OctApiLlm2ListRemoveItem(void * l,UINT32 list_handle,UINT32 item_key, PUINT32 prev_item_key_pnt, PUINT32 prev_prev_item_key_pnt, PUINT32 remove_status_pnt ); -UINT32 OctApiLlm2ListItemData( PVOID l,UINT32 list_handle,UINT32 item_key,PVOID* item_data_pnt, PUINT32 item_number ); - +/* Second list manager using a key to order info in the list. */ +UINT32 OctApiLlm2ListGetSize( UINT32 number_of_items, UINT32 number_of_lists, UINT32 user_info_size, PUINT32 l_size ); +UINT32 OctApiLlm2ListInit( PVOID* l,UINT32 number_of_items, UINT32 number_of_lists, UINT32 user_info_size ); +UINT32 OctApiLlm2ListCreate( PVOID l, PUINT32 list_handle ); +UINT32 OctApiLlm2ListLength( PVOID l, UINT32 list_handle, PUINT32 number_of_items_in_list ); +UINT32 OctApiLlm2ListInsertItem(void * l, UINT32 list_handle, UINT32 item_key, void ** item_data_pnt, void ** prev_item_data_pnt, void ** prev_prev_item_data_pnt, PUINT32 insert_status_pnt ); +UINT32 OctApiLlm2ListRemoveItem(void * l, UINT32 list_handle, UINT32 item_key, PUINT32 prev_item_key_pnt, PUINT32 prev_prev_item_key_pnt, PUINT32 remove_status_pnt ); +UINT32 OctApiLlm2ListItemData( PVOID l, UINT32 list_handle, UINT32 item_key, PVOID* item_data_pnt, PUINT32 item_number ); #ifdef __cplusplus } -#endif /* __cplusplus*/ +#endif /* __cplusplus */ + +#endif /* __OCTAPI_LLMAN_H__ */ diff --git a/include/oct6100api/oct6100_adpcm_chan_inst.h b/include/oct6100api/oct6100_adpcm_chan_inst.h index b74ce9e..4e41ada 100644 --- a/include/oct6100api/oct6100_adpcm_chan_inst.h +++ b/include/oct6100api/oct6100_adpcm_chan_inst.h @@ -2,7 +2,7 @@ File: oct6100_adpcm_chan_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 5 $ diff --git a/include/oct6100api/oct6100_adpcm_chan_pub.h b/include/oct6100api/oct6100_adpcm_chan_pub.h index f0c32d9..6c55ac9 100644 --- a/include/oct6100api/oct6100_adpcm_chan_pub.h +++ b/include/oct6100api/oct6100_adpcm_chan_pub.h @@ -2,7 +2,7 @@ File: oct6100_adpcm_chan_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 4 $ diff --git a/include/oct6100api/oct6100_api.h b/include/oct6100api/oct6100_api.h index 5652375..fc4ae96 100644 --- a/include/oct6100api/oct6100_api.h +++ b/include/oct6100api/oct6100_api.h @@ -2,7 +2,7 @@ File: oct6100_api.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 22 $ diff --git a/include/oct6100api/oct6100_api_inst.h b/include/oct6100api/oct6100_api_inst.h index 679d9e6..1ea424a 100644 --- a/include/oct6100api/oct6100_api_inst.h +++ b/include/oct6100api/oct6100_api_inst.h @@ -2,7 +2,7 @@ File: oct6100_api_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 39 $ diff --git a/include/oct6100api/oct6100_apimi.h b/include/oct6100api/oct6100_apimi.h index abcad76..51e1511 100644 --- a/include/oct6100api/oct6100_apimi.h +++ b/include/oct6100api/oct6100_apimi.h @@ -2,7 +2,7 @@ File: oct6100_apimi.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -27,7 +27,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 5 $ diff --git a/include/oct6100api/oct6100_apiud.h b/include/oct6100api/oct6100_apiud.h index 7f21de7..12fad54 100644 --- a/include/oct6100api/oct6100_apiud.h +++ b/include/oct6100api/oct6100_apiud.h @@ -2,7 +2,7 @@ File: oct6100_apiud.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 15 $ diff --git a/include/oct6100api/oct6100_channel_inst.h b/include/oct6100api/oct6100_channel_inst.h index 8480c98..e33ca1b 100644 --- a/include/oct6100api/oct6100_channel_inst.h +++ b/include/oct6100api/oct6100_channel_inst.h @@ -2,7 +2,7 @@ File: oct6100_channel_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ -$Octasic_Revision: 84 $ +$Octasic_Revision: 88 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -93,11 +93,11 @@ typedef struct _OCT6100_API_CHANNEL_VQE_ UINT8 fRinAutomaticLevelControl; UINT8 fSoutAutomaticLevelControl; - INT8 chRinAutomaticLevelControlTargetDb; - INT8 chSoutAutomaticLevelControlTargetDb; + OCT_INT8 chRinAutomaticLevelControlTargetDb; + OCT_INT8 chSoutAutomaticLevelControlTargetDb; UINT8 fRinHighLevelCompensation; - INT8 chRinHighLevelCompensationThresholdDb; + OCT_INT8 chRinHighLevelCompensationThresholdDb; UINT8 bySoutAutomaticListenerEnhancementGainDb; UINT8 fSoutNaturalListenerEnhancement; @@ -109,14 +109,14 @@ typedef struct _OCT6100_API_CHANNEL_VQE_ UINT8 byNonLinearityBehaviorA; UINT8 byNonLinearityBehaviorB; - INT8 chRinLevelControlGainDb; - INT8 chSoutLevelControlGainDb; + OCT_INT8 chRinLevelControlGainDb; + OCT_INT8 chSoutLevelControlGainDb; - INT8 chDefaultErlDb; - INT8 chAecDefaultErlDb; + OCT_INT8 chDefaultErlDb; + OCT_INT8 chAecDefaultErlDb; UINT8 fRoutNoiseReduction; - INT8 chAnrSnrEnhancementDb; + OCT_INT8 chAnrSnrEnhancementDb; UINT8 fEnableMusicProtection; UINT8 fIdleCodeDetection; @@ -130,6 +130,11 @@ typedef struct _OCT6100_API_CHANNEL_VQE_ UINT8 byDoubleTalkBehavior; UINT8 fSoutNoiseBleaching; + UINT8 fResetRinAlcOnTones; + UINT8 fResetSoutAlcOnTones; + + UINT16 usAlcNoiseBleedOutTime; + UINT8 fSoutConferencingNoiseReduction; @@ -374,13 +379,15 @@ typedef struct _OCT6100_API_BIDIR_CHANNEL_ { UINT16 usFirstChanIndex; UINT16 usSecondChanIndex; - + /* Flag specifying whether the entry is used or not. */ UINT8 fReserved; /* Count used to manage entry handles allocated to user. */ UINT8 byEntryOpenCnt; + + } tOCT6100_API_BIDIR_CHANNEL, *tPOCT6100_API_BIDIR_CHANNEL; #endif /* __OCT6100_CHANNEL_INST_H__ */ diff --git a/include/oct6100api/oct6100_channel_pub.h b/include/oct6100api/oct6100_channel_pub.h index 2ed2797..b6e3565 100644 --- a/include/oct6100api/oct6100_channel_pub.h +++ b/include/oct6100api/oct6100_channel_pub.h @@ -2,7 +2,7 @@ File: oct6100_channel_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ -$Octasic_Revision: 79 $ +$Octasic_Revision: 82 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -80,7 +80,9 @@ typedef struct _OCT6100_CHANNEL_OPEN_VQE_ BOOL fRinLevelControl; BOOL fSoutLevelControl; BOOL fRinAutomaticLevelControl; + BOOL fResetRinAlcOnTones; BOOL fSoutAutomaticLevelControl; + BOOL fResetSoutAlcOnTones; BOOL fRinHighLevelCompensation; BOOL fAcousticEcho; BOOL fSoutAdaptiveNoiseReduction; @@ -97,6 +99,7 @@ typedef struct _OCT6100_CHANNEL_OPEN_VQE_ INT32 lSoutLevelControlGainDb; INT32 lRinAutomaticLevelControlTargetDb; INT32 lSoutAutomaticLevelControlTargetDb; + UINT32 ulAlcNoiseBleedOutTime; INT32 lRinHighLevelCompensationThresholdDb; INT32 lDefaultErlDb; INT32 lAecDefaultErlDb; @@ -198,7 +201,9 @@ typedef struct _OCT6100_CHANNEL_MODIFY_VQE_ BOOL fRinLevelControl; BOOL fSoutLevelControl; BOOL fRinAutomaticLevelControl; + BOOL fResetRinAlcOnTones; BOOL fSoutAutomaticLevelControl; + BOOL fResetSoutAlcOnTones; BOOL fRinHighLevelCompensation; BOOL fAcousticEcho; BOOL fSoutAdaptiveNoiseReduction; @@ -215,6 +220,7 @@ typedef struct _OCT6100_CHANNEL_MODIFY_VQE_ INT32 lSoutLevelControlGainDb; INT32 lRinAutomaticLevelControlTargetDb; INT32 lSoutAutomaticLevelControlTargetDb; + UINT32 ulAlcNoiseBleedOutTime; INT32 lRinHighLevelCompensationThresholdDb; INT32 lDefaultErlDb; INT32 lAecDefaultErlDb; @@ -349,7 +355,9 @@ typedef struct _OCT6100_CHANNEL_STATS_VQE_ BOOL fRinLevelControl; BOOL fSoutLevelControl; BOOL fRinAutomaticLevelControl; + BOOL fResetRinAlcOnTones; BOOL fSoutAutomaticLevelControl; + BOOL fResetSoutAlcOnTones; BOOL fRinHighLevelCompensation; BOOL fAcousticEcho; BOOL fSoutAdaptiveNoiseReduction; @@ -366,6 +374,7 @@ typedef struct _OCT6100_CHANNEL_STATS_VQE_ INT32 lSoutLevelControlGainDb; INT32 lRinAutomaticLevelControlTargetDb; INT32 lSoutAutomaticLevelControlTargetDb; + UINT32 ulAlcNoiseBleedOutTime; INT32 lRinHighLevelCompensationThresholdDb; INT32 lDefaultErlDb; INT32 lAecDefaultErlDb; @@ -452,6 +461,8 @@ typedef struct _OCT6100_CHANNEL_CREATE_BIDIR_ UINT32 ulFirstChannelHndl; UINT32 ulSecondChannelHndl; + + } tOCT6100_CHANNEL_CREATE_BIDIR, *tPOCT6100_CHANNEL_CREATE_BIDIR; diff --git a/include/oct6100api/oct6100_chip_open_inst.h b/include/oct6100api/oct6100_chip_open_inst.h index f1ee150..49ba6d6 100644 --- a/include/oct6100api/oct6100_chip_open_inst.h +++ b/include/oct6100api/oct6100_chip_open_inst.h @@ -2,7 +2,7 @@ File: oct6100_chip_open_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ -$Octasic_Revision: 116 $ +$Octasic_Revision: 118 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -336,6 +336,15 @@ typedef struct _OCT6100_API_MEMORY_MAP_ /* Idle code detection field offset. */ tOCT6100_TLV_OFFSET IdleCodeDetectionFieldOfst; + /* Reset Rin ALC on tones field offset. */ + tOCT6100_TLV_OFFSET ResetRinAlcOnTonesFieldOfst; + + /* Reset Sout ALC on tones field offset. */ + tOCT6100_TLV_OFFSET ResetSoutAlcOnTonesFieldOfst; + + /* ALC noise bleed out time field offset. */ + tOCT6100_TLV_OFFSET AlcNoiseBleedOutTimeFieldOfst; + /* TSI memory mapping information.*/ UINT32 ulNumTsiEntries; @@ -458,8 +467,12 @@ typedef struct _OCT6100_API_IMAGE_INFO_ UINT8 fIdleCodeDetection; UINT8 fIdleCodeDetectionConfiguration; + + UINT8 fResetRinAlcOnTones; + UINT8 fResetSoutAlcOnTones; UINT8 fSinLevel; + UINT8 fAlcNoiseBleedOutTime; diff --git a/include/oct6100api/oct6100_chip_open_pub.h b/include/oct6100api/oct6100_chip_open_pub.h index ef4151f..e4c42e9 100644 --- a/include/oct6100api/oct6100_chip_open_pub.h +++ b/include/oct6100api/oct6100_chip_open_pub.h @@ -2,7 +2,7 @@ File: oct6100_chip_open_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 48 $ diff --git a/include/oct6100api/oct6100_chip_stats_inst.h b/include/oct6100api/oct6100_chip_stats_inst.h index 1c4156b..5e731d5 100644 --- a/include/oct6100api/oct6100_chip_stats_inst.h +++ b/include/oct6100api/oct6100_chip_stats_inst.h @@ -2,7 +2,7 @@ File: oct6100_chip_stats_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 21 $ diff --git a/include/oct6100api/oct6100_chip_stats_pub.h b/include/oct6100api/oct6100_chip_stats_pub.h index 57add0e..5ccd74c 100644 --- a/include/oct6100api/oct6100_chip_stats_pub.h +++ b/include/oct6100api/oct6100_chip_stats_pub.h @@ -2,7 +2,7 @@ File: oct6100_chip_stats_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ -$Octasic_Revision: 55 $ +$Octasic_Revision: 57 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -85,6 +85,8 @@ typedef struct _OCT6100_CHIP_IMAGE_INFO_ BOOL fAdaptiveNoiseReduction; BOOL fSoutNoiseBleaching; BOOL fAutoLevelControl; + BOOL fAlcNoiseBleedOutTime; + BOOL fResetAlcOnTones; BOOL fHighLevelCompensation; BOOL fSilenceSuppression; diff --git a/include/oct6100api/oct6100_conf_bridge_inst.h b/include/oct6100api/oct6100_conf_bridge_inst.h index ebe2da3..f51a7db 100644 --- a/include/oct6100api/oct6100_conf_bridge_inst.h +++ b/include/oct6100api/oct6100_conf_bridge_inst.h @@ -2,7 +2,7 @@ File: oct6100_conf_bridge_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 19 $ diff --git a/include/oct6100api/oct6100_conf_bridge_pub.h b/include/oct6100api/oct6100_conf_bridge_pub.h index 5998be7..395ef1f 100644 --- a/include/oct6100api/oct6100_conf_bridge_pub.h +++ b/include/oct6100api/oct6100_conf_bridge_pub.h @@ -2,7 +2,7 @@ File: oct6100_conf_bridge_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 22 $ diff --git a/include/oct6100api/oct6100_debug_inst.h b/include/oct6100api/oct6100_debug_inst.h index 7635411..519e88a 100644 --- a/include/oct6100api/oct6100_debug_inst.h +++ b/include/oct6100api/oct6100_debug_inst.h @@ -2,7 +2,7 @@ File: oct6100_debug_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ -$Octasic_Revision: 9 $ +$Octasic_Revision: 10 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -116,6 +116,9 @@ typedef struct _OCT6100_API_DEBUG_ /* AF events control block size. */ UINT32 ulAfEventCbByteSize; + /* Current user selected data mode. Must be kept constant throughout a debug session. */ + UINT32 ulCurrentGetDataMode; + } tOCT6100_API_DEBUG, *tPOCT6100_API_DEBUG; #endif /* __OCT6100_DEBUG_INST_H__ */ diff --git a/include/oct6100api/oct6100_debug_pub.h b/include/oct6100api/oct6100_debug_pub.h index fe61a5f..4b42f20 100644 --- a/include/oct6100api/oct6100_debug_pub.h +++ b/include/oct6100api/oct6100_debug_pub.h @@ -2,7 +2,7 @@ File: oct6100_debug_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ -$Octasic_Revision: 13 $ +$Octasic_Revision: 14 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -50,6 +50,7 @@ typedef struct _OCT6100_DEBUG_SELECT_CHANNEL_ typedef struct _OCT6100_DEBUG_GET_DATA_ { UINT32 ulGetDataMode; + UINT32 ulGetDataContent; UINT32 ulRemainingNumBytes; UINT32 ulTotalNumBytes; UINT32 ulMaxBytes; diff --git a/include/oct6100api/oct6100_defines.h b/include/oct6100api/oct6100_defines.h index 67e8d2e..1d35381 100644 --- a/include/oct6100api/oct6100_defines.h +++ b/include/oct6100api/oct6100_defines.h @@ -2,7 +2,7 @@ File: oct6100_defines.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.7 -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ -$Octasic_Revision: 164 $ +$Octasic_Revision: 166 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -210,7 +210,6 @@ $Octasic_Revision: 164 $ /* Clocks defines */ #define cOCT6100_UPCLK_FREQ_33_33_MHZ 33333333 -#define cOCT6100_UPCLK_FREQ_66_67_MHZ 66666667 #define cOCT6100_MCLK_FREQ_133_MHZ 133000000 #define cOCT6100_MCLK_FREQ_125_MHZ 125000000 @@ -616,6 +615,12 @@ $Octasic_Revision: 164 $ #define cOCT6100_DEBUG_GET_DATA_MODE_16S 0x2 #define cOCT6100_DEBUG_GET_DATA_MODE_120S 0x3 +/* Debug get data dump content. */ +#define cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE 0x0 /* Full binary dump to be sent for support. */ +#define cOCT6100_DEBUG_GET_DATA_CONTENT_RIN_PCM 0x1 /* Only Rin PCM stream data. */ +#define cOCT6100_DEBUG_GET_DATA_CONTENT_SIN_PCM 0x2 /* Only Sin PCM stream data. */ +#define cOCT6100_DEBUG_GET_DATA_CONTENT_SOUT_PCM 0x3 /* Only Sout PCM stream data. */ + #define cOCT6100_BIST_IN_PROGRESS 0x0 diff --git a/include/oct6100api/oct6100_errors.h b/include/oct6100api/oct6100_errors.h index 787965c..816a088 100644 --- a/include/oct6100api/oct6100_errors.h +++ b/include/oct6100api/oct6100_errors.h @@ -2,7 +2,7 @@ File: oct6100_errors.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ -$Octasic_Revision: 189 $ +$Octasic_Revision: 196 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -82,6 +82,9 @@ $Octasic_Revision: 189 $ #define cOCT6100_ERR_NOT_SUPPORTED_DOUBLE_TALK_BEHAVIOR_MODE (0x00024 + cOCT6100_NOT_SUPPORTED_BASE) #define cOCT6100_ERR_NOT_SUPPORTED_IDLE_CODE_DETECTION (0x00025 + cOCT6100_NOT_SUPPORTED_BASE) #define cOCT6100_ERR_NOT_SUPPORTED_IDLE_CODE_DETECTION_CONFIG (0x00026 + cOCT6100_NOT_SUPPORTED_BASE) +#define cOCT6100_ERR_NOT_SUPPORTED_RESET_RIN_ALC_ON_TONES (0x00027 + cOCT6100_NOT_SUPPORTED_BASE) +#define cOCT6100_ERR_NOT_SUPPORTED_RESET_SOUT_ALC_ON_TONES (0x00028 + cOCT6100_NOT_SUPPORTED_BASE) +#define cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_ALC_NOISE_BLEED_OUT_TIME (0x00029 + cOCT6100_NOT_SUPPORTED_BASE) #define cOCT6100_ERR_NOT_SUPPORTED_BUFFER_PLAYOUT (0x00100 + cOCT6100_NOT_SUPPORTED_BASE) #define cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_CNR (0x00101 + cOCT6100_NOT_SUPPORTED_BASE) @@ -398,6 +401,14 @@ $Octasic_Revision: 189 $ #define cOCT6100_ERR_CHANNEL_ANR_CNR_SIMULTANEOUSLY (0x070C0 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_CHANNEL_IDLE_CODE_DETECTION (0x070C1 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_CHANNEL_MUST_ENABLE_TONE_DISABLER (0x070C2 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_CHANNEL_RESET_RIN_ALC_ON_TONES (0x070C3 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_CHANNEL_RESET_SOUT_ALC_ON_TONES (0x070C4 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_CHANNEL_RIN_AUTO_LEVEL_CONTROL_REQUIRED (0x070C5 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_CHANNEL_SOUT_AUTO_LEVEL_CONTROL_REQUIRED (0x070C6 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_CHANNEL_ALC_NOISE_BLEED_OUT_TIME (0x070C7 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_CHANNEL_AUTO_LEVEL_CONTROL_REQUIRED (0x070C8 + cOCT6100_ERR_BASE) + +#define cOCT6100_ERR_CHANNEL_COMFORT_NOISE_REQUIRED (0x070CB + cOCT6100_ERR_BASE) #define cOCT6100_ERR_PHASING_TSST_ALL_ENTRIES_ARE_OPENED (0x08000 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_PHASING_TSST_DISABLED (0x08001 + cOCT6100_ERR_BASE) @@ -509,7 +520,9 @@ $Octasic_Revision: 189 $ #define cOCT6100_ERR_DEBUG_GET_DATA_PTR_INVALID (0x11011 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_DEBUG_RC_CHANNEL_RECORDING_DISABLED (0x11012 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_DEBUG_GET_DATA_MODE (0x11013 + cOCT6100_ERR_BASE) - +#define cOCT6100_ERR_DEBUG_CHANNEL_IN_POWER_DOWN (0x11014 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_DEBUG_GET_DATA_CONTENT (0x11015 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_DEBUG_GET_DATA_MODE_CANNOT_CHANGE (0x11016 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_MIXER_ALL_COPY_EVENT_ENTRY_OPENED (0x12000 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_MIXER_COPY_EVENT_HANDLE (0x12001 + cOCT6100_ERR_BASE) @@ -812,5 +825,6 @@ $Octasic_Revision: 189 $ #define cOCT6100_ERR_FATAL_E7 (0x000E7 + cOCT6100_FATAL_BASE) #define cOCT6100_ERR_FATAL_E8 (0x000E8 + cOCT6100_FATAL_BASE) #define cOCT6100_ERR_FATAL_E9 (0x000E9 + cOCT6100_FATAL_BASE) +#define cOCT6100_ERR_FATAL_EA (0x000EA + cOCT6100_FATAL_BASE) #endif /* __OCT6100_ERRORS_H__ */ diff --git a/include/oct6100api/oct6100_events_inst.h b/include/oct6100api/oct6100_events_inst.h index 8d0a049..0e4647e 100644 --- a/include/oct6100api/oct6100_events_inst.h +++ b/include/oct6100api/oct6100_events_inst.h @@ -3,7 +3,7 @@ File: oct6100_events_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -26,7 +26,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 11 $ diff --git a/include/oct6100api/oct6100_events_pub.h b/include/oct6100api/oct6100_events_pub.h index 96fbc39..26cd0c8 100644 --- a/include/oct6100api/oct6100_events_pub.h +++ b/include/oct6100api/oct6100_events_pub.h @@ -3,7 +3,7 @@ File: oct6100_events_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -26,7 +26,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 13 $ diff --git a/include/oct6100api/oct6100_interrupts_inst.h b/include/oct6100api/oct6100_interrupts_inst.h index 00bfd4c..2897eac 100644 --- a/include/oct6100api/oct6100_interrupts_inst.h +++ b/include/oct6100api/oct6100_interrupts_inst.h @@ -2,7 +2,7 @@ File: oct6100_interrupts_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 16 $ diff --git a/include/oct6100api/oct6100_interrupts_pub.h b/include/oct6100api/oct6100_interrupts_pub.h index d75f72d..67047dc 100644 --- a/include/oct6100api/oct6100_interrupts_pub.h +++ b/include/oct6100api/oct6100_interrupts_pub.h @@ -2,7 +2,7 @@ File: oct6100_interrupts_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 23 $ diff --git a/include/oct6100api/oct6100_mixer_inst.h b/include/oct6100api/oct6100_mixer_inst.h index 2c7707f..c267e92 100644 --- a/include/oct6100api/oct6100_mixer_inst.h +++ b/include/oct6100api/oct6100_mixer_inst.h @@ -2,7 +2,7 @@ File: oct6100_mixer_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 13 $ diff --git a/include/oct6100api/oct6100_mixer_pub.h b/include/oct6100api/oct6100_mixer_pub.h index 004d1e5..257d41d 100644 --- a/include/oct6100api/oct6100_mixer_pub.h +++ b/include/oct6100api/oct6100_mixer_pub.h @@ -2,7 +2,7 @@ File: oct6100_mixer_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 7 $ diff --git a/include/oct6100api/oct6100_phasing_tsst_inst.h b/include/oct6100api/oct6100_phasing_tsst_inst.h index 5624238..c3802f1 100644 --- a/include/oct6100api/oct6100_phasing_tsst_inst.h +++ b/include/oct6100api/oct6100_phasing_tsst_inst.h @@ -2,7 +2,7 @@ File: oct6100_phasing_tsst_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 9 $ diff --git a/include/oct6100api/oct6100_phasing_tsst_pub.h b/include/oct6100api/oct6100_phasing_tsst_pub.h index b5f5e8e..7c070df 100644 --- a/include/oct6100api/oct6100_phasing_tsst_pub.h +++ b/include/oct6100api/oct6100_phasing_tsst_pub.h @@ -2,7 +2,7 @@ File: oct6100_phasing_tsst_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 9 $ diff --git a/include/oct6100api/oct6100_playout_buf_inst.h b/include/oct6100api/oct6100_playout_buf_inst.h index 9cc297d..3ce4906 100644 --- a/include/oct6100api/oct6100_playout_buf_inst.h +++ b/include/oct6100api/oct6100_playout_buf_inst.h @@ -2,7 +2,7 @@ File: oct6100_playout_buf_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ -$Octasic_Revision: 9 $ +$Octasic_Revision: 10 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -40,10 +40,10 @@ $Octasic_Revision: 9 $ /***************************** DEFINES *************************************/ #define mOCT6100_GET_BUFFER_MEMORY_NODE_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_BUFFER_PLAYOUT_MALLOC_NODE )(( PVOID )pSharedInfo + pSharedInfo->ulPlayoutBufMemoryNodeListOfst ); + pList = ( tPOCT6100_API_BUFFER_PLAYOUT_MALLOC_NODE )(( PUINT8 )pSharedInfo + pSharedInfo->ulPlayoutBufMemoryNodeListOfst ); #define mOCT6100_GET_BUFFER_MEMORY_NODE_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_BUFFER_PLAYOUT_MALLOC_NODE )(( PVOID )pSharedInfo + pSharedInfo->ulPlayoutBufMemoryNodeListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_BUFFER_PLAYOUT_MALLOC_NODE )(( PUINT8 )pSharedInfo + pSharedInfo->ulPlayoutBufMemoryNodeListOfst)) + ulIndex; /***************************** TYPES ***************************************/ diff --git a/include/oct6100api/oct6100_playout_buf_pub.h b/include/oct6100api/oct6100_playout_buf_pub.h index 97c110c..2588cbe 100644 --- a/include/oct6100api/oct6100_playout_buf_pub.h +++ b/include/oct6100api/oct6100_playout_buf_pub.h @@ -2,7 +2,7 @@ File: oct6100_playout_buf_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 21 $ diff --git a/include/oct6100api/oct6100_remote_debug_inst.h b/include/oct6100api/oct6100_remote_debug_inst.h index d12415a..edf4e3f 100644 --- a/include/oct6100api/oct6100_remote_debug_inst.h +++ b/include/oct6100api/oct6100_remote_debug_inst.h @@ -2,7 +2,7 @@ File: oct6100_remote_debug_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 6 $ diff --git a/include/oct6100api/oct6100_remote_debug_pub.h b/include/oct6100api/oct6100_remote_debug_pub.h index 967011d..55b2c64 100644 --- a/include/oct6100api/oct6100_remote_debug_pub.h +++ b/include/oct6100api/oct6100_remote_debug_pub.h @@ -2,7 +2,7 @@ File: oct6100_remote_debug_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 6 $ diff --git a/include/oct6100api/oct6100_tlv_inst.h b/include/oct6100api/oct6100_tlv_inst.h index d4d670b..9d72d7d 100644 --- a/include/oct6100api/oct6100_tlv_inst.h +++ b/include/oct6100api/oct6100_tlv_inst.h @@ -2,7 +2,7 @@ File: oct6100_tlv_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 7 $ diff --git a/include/oct6100api/oct6100_tone_detection_inst.h b/include/oct6100api/oct6100_tone_detection_inst.h index 3e1b72e..8db8a52 100644 --- a/include/oct6100api/oct6100_tone_detection_inst.h +++ b/include/oct6100api/oct6100_tone_detection_inst.h @@ -2,7 +2,7 @@ File: oct6100_tone_detection_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 8 $ diff --git a/include/oct6100api/oct6100_tone_detection_pub.h b/include/oct6100api/oct6100_tone_detection_pub.h index 93e9688..4ff70a1 100644 --- a/include/oct6100api/oct6100_tone_detection_pub.h +++ b/include/oct6100api/oct6100_tone_detection_pub.h @@ -2,7 +2,7 @@ File: oct6100_tone_detection_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 10 $ diff --git a/include/oct6100api/oct6100_tsi_cnct_inst.h b/include/oct6100api/oct6100_tsi_cnct_inst.h index 31f9be3..992ddfb 100644 --- a/include/oct6100api/oct6100_tsi_cnct_inst.h +++ b/include/oct6100api/oct6100_tsi_cnct_inst.h @@ -2,7 +2,7 @@ File: oct6100_tsi_cnct_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 8 $ diff --git a/include/oct6100api/oct6100_tsi_cnct_pub.h b/include/oct6100api/oct6100_tsi_cnct_pub.h index 9a8ae50..dd6b004 100644 --- a/include/oct6100api/oct6100_tsi_cnct_pub.h +++ b/include/oct6100api/oct6100_tsi_cnct_pub.h @@ -2,7 +2,7 @@ File: oct6100_tsi_cnct_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 10 $ diff --git a/include/oct6100api/oct6100_tsst_inst.h b/include/oct6100api/oct6100_tsst_inst.h index 34bb022..d8de2e3 100644 --- a/include/oct6100api/oct6100_tsst_inst.h +++ b/include/oct6100api/oct6100_tsst_inst.h @@ -2,7 +2,7 @@ File: oct6100_tsst_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ $Octasic_Revision: 5 $ diff --git a/include/octdef.h b/include/octdef.h index 9631727..e1bf0ba 100644 --- a/include/octdef.h +++ b/include/octdef.h @@ -2,19 +2,29 @@ File: octdef.h -Copyright (c) 2001 Octasic Inc. All rights reserved. + Copyright (c) 2001-2006 Octasic Inc. -Description: Common system definitions +Description: -This source code is Octasic Confidential. Use of and access to this code -is covered by the Octasic Device Enabling Software License Agreement. -Acknowledgement of the Octasic Device Enabling Software License was -required for access to this code. A copy was also provided with the release. + Common system definitions. +This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API is +free software; you can redistribute it and/or modify it under the terms of +the GNU General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. -$Octasic_Release: OCT610xAPI-01.00-PR37 $ +The OCT6100 GPL API is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -$Octasic_Revision: 11 $ +You should have received a copy of the GNU General Public License +along with the OCT6100 GPL API; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +$Octasic_Release: OCT612xAPI-01.00-PR43 $ + +$Octasic_Revision: 12 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -54,11 +64,11 @@ extern "C" { #define PROTO extern #endif -/* Generic return codes */ +/* Generic return codes. */ #define cOCTDEF_RC_OK 0 /* Generic Ok */ #define cOCTDEF_RC_ERROR 1 /* Generic Error */ -/* Default return values of all OCTAPI functions.*/ +/* Default return values of all OCTAPI functions. */ #ifndef GENERIC_OK #define GENERIC_OK 0x00000000 #endif @@ -71,7 +81,7 @@ extern "C" { #define GENERIC_BAD_PARAM 0x00000002 #endif -/* Defines of boolean expressions (TRUE/FALSE)*/ +/* Defines of boolean expressions (TRUE/FALSE) */ #ifndef FALSE #define FALSE (BOOL)0 #endif @@ -96,7 +106,6 @@ extern "C" { C language ----------------------------------------------------------------------------*/ - #ifdef __cplusplus } #endif diff --git a/include/octmac.h b/include/octmac.h index f8ce932..5e72470 100644 --- a/include/octmac.h +++ b/include/octmac.h @@ -2,25 +2,34 @@ File: octmac.h -Copyright (c) 2001 Octasic Inc. All rights reserved. + Copyright (c) 2001-2006 Octasic Inc. Description: -This source code is Octasic Confidential. Use of and access to this code -is covered by the Octasic Device Enabling Software License Agreement. -Acknowledgement of the Octasic Device Enabling Software License was -required for access to this code. A copy was also provided with the release. + Common macro definitions. +This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API is +free software; you can redistribute it and/or modify it under the terms of +the GNU General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. -$Octasic_Release: OCT610xAPI-01.00-PR37 $ +The OCT6100 GPL API is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -$Octasic_Revision: 13 $ +You should have received a copy of the GNU General Public License +along with the OCT6100 GPL API; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +$Octasic_Release: OCT612xAPI-01.00-PR43 $ + +$Octasic_Revision: 14 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTMAC_H__ #define __OCTMAC_H__ - /*-------------------------------------------------------------------------- C language ----------------------------------------------------------------------------*/ @@ -29,7 +38,6 @@ $Octasic_Revision: 13 $ extern "C" { #endif - /***************************** DEFINES *************************************/ /* Combine l & h to form a 32 bit quantity. */ diff --git a/include/octosdependant.h b/include/octosdependant.h index a55fcf1..b7ff715 100644 --- a/include/octosdependant.h +++ b/include/octosdependant.h @@ -2,19 +2,29 @@ File: octosdependant.h -Copyright (c) 2001 Octasic Inc. All rights reserved. + Copyright (c) 2001-2006 Octasic Inc. -Description: This file is included to set target-specific constants +Description: -This source code is Octasic Confidential. Use of and access to this code -is covered by the Octasic Device Enabling Software License Agreement. -Acknowledgement of the Octasic Device Enabling Software License was -required for access to this code. A copy was also provided with the release. + This file is included to set target-specific constants. +This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API is +free software; you can redistribute it and/or modify it under the terms of +the GNU General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. -$Octasic_Release: OCT610xAPI-01.00-PR37 $ +The OCT6100 GPL API is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -$Octasic_Revision: 15 $ +You should have received a copy of the GNU General Public License +along with the OCT6100 GPL API; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +$Octasic_Release: OCT612xAPI-01.00-PR43 $ + +$Octasic_Revision: 16 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -133,6 +143,7 @@ extern "C" { #ifdef _DEBUG #define OCT_OPT_USER_DEBUG #endif + /*-------------------------------------------------------------------------- C language ----------------------------------------------------------------------------*/ @@ -142,4 +153,3 @@ extern "C" { #endif #endif /* __OCTOSDEPENDANT_H__ */ - diff --git a/include/octrpc/oct6100_rpc_protocol.h b/include/octrpc/oct6100_rpc_protocol.h index a017a34..4318643 100644 --- a/include/octrpc/oct6100_rpc_protocol.h +++ b/include/octrpc/oct6100_rpc_protocol.h @@ -1,35 +1,42 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ -File: oct6100_rpc_protocol.h +File: oct6100_rpc_protocol.h -Copyright (c) 2002 Octasic Inc. All rights reserved. + Copyright (c) 2001-2006 Octasic Inc. Description: -This section defines the intent of the file. + File containing all defines and prototypes related to the OCT6100 RPC + protocol for exchanging debug commands. -This source code is Octasic Confidential. Use of and access to this code -is covered by the Octasic Device Enabling Software License Agreement. -Acknowledgement of the Octasic Device Enabling Software License was -required for access to this code. A copy was also provided with the release. +This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API is +free software; you can redistribute it and/or modify it under the terms of +the GNU General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. +The OCT6100 GPL API is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -$Octasic_Release: OCT610xAPI-01.00-PR37 $ +You should have received a copy of the GNU General Public License +along with the OCT6100 GPL API; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Revision: 4 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ + +$Octasic_Revision: 6 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCT6100_RPC_PROTOCOL_H__ #define __OCT6100_RPC_PROTOCOL_H__ -/***************************** INCLUDE FILES *******************************/ - - /***************************** DEFINES *************************************/ + #define cOCTRPC_INTERFACE_VERSION 0x00010002 -/* Octasic commands */ +/* Octasic commands. */ #define cOCT6100_RPC_CHIP_LIST 0xFF000000 #define cOCT6100_RPC_CHIP_CHOICE 0xFF000001 #define cOCT6100_RPC_ENV_DISCONNECT 0xFF000002 @@ -60,6 +67,7 @@ $Octasic_Revision: 4 $ #define cOCT6100_RPCERR_INVALID_COMMAND_PAYLOAD 0x00000002 #define cOCT6100_RPCERR_INVALID_COMMAND_LENGTH 0x00000003 + /***************************** TYPES ***************************************/ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ @@ -337,8 +345,4 @@ typedef struct _OCT6100_RPC_GET_DEBUG_CHAN_INDEX_ } tOCT6100_RPC_GET_DEBUG_CHAN_INDEX, *tPOCT6100_RPC_GET_DEBUG_CHAN_INDEX; - -/************************** FUNCTION PROTOTYPES *****************************/ - - #endif /* __OCT6100_RPC_PROTOCOL_H__ */ diff --git a/include/octrpc/rpc_protocol.h b/include/octrpc/rpc_protocol.h index 4cbefd0..358b7f9 100644 --- a/include/octrpc/rpc_protocol.h +++ b/include/octrpc/rpc_protocol.h @@ -2,21 +2,29 @@ File: rpc_protocol.h -Copyright (c) 2001 Octasic Inc. All rights reserved. + Copyright (c) 2001-2006 Octasic Inc. Description: -This section defines the intent of the file. +This file contains RPC related definitions and prototypes. -This source code is Octasic Confidential. Use of and access to this code -is covered by the Octasic Device Enabling Software License Agreement. -Acknowledgement of the Octasic Device Enabling Software License was -required for access to this code. A copy was also provided with the release. +This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API is +free software; you can redistribute it and/or modify it under the terms of +the GNU General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. +The OCT6100 GPL API is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -$Octasic_Release: OCT610xAPI-01.00-PR37 $ +You should have received a copy of the GNU General Public License +along with the OCT6100 GPL API; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Revision: 22 $ +$Octasic_Release: OCT612xAPI-01.00-PR43 $ + +$Octasic_Revision: 23 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -27,6 +35,7 @@ $Octasic_Revision: 22 $ /***************************** DEFINES *************************************/ + #define cOCTRPC_ENDIAN_DETECT 0x27182819 #define cOCTRPC_ENDIAN_DETECT_BYTE_W 0x19 #define cOCTRPC_ENDIAN_DETECT_BYTE_X 0x28 @@ -74,6 +83,7 @@ $Octasic_Revision: 22 $ /***************************** TYPES ***************************************/ + typedef struct _OCTRPC_OGRDTP_HEADER_ { UINT32 IN ulEndianDetect; @@ -102,6 +112,4 @@ typedef struct _OCTRPC_COMMAND_HEADER_ } tOCTRPC_COMMAND_HEADER, *tPOCTRPC_COMMAND_HEADER; - - #endif /* __RPC_PROTOCOL_H__ */ diff --git a/include/octtype.h b/include/octtype.h index 6757fa9..bc73731 100644 --- a/include/octtype.h +++ b/include/octtype.h @@ -2,19 +2,29 @@ File: octtype.h -Copyright (c) 2001 Octasic Inc. All rights reserved. + Copyright (c) 2001-2006 Octasic Inc. -Description: This file defines the base storage types. +Description: -This source code is Octasic Confidential. Use of and access to this code -is covered by the Octasic Device Enabling Software License Agreement. -Acknowledgement of the Octasic Device Enabling Software License was -required for access to this code. A copy was also provided with the release. + This file defines the base storage types. +This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API is +free software; you can redistribute it and/or modify it under the terms of +the GNU General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. -$Octasic_Release: OCT610xAPI-01.00-PR37 $ +The OCT6100 GPL API is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -$Octasic_Revision: 15 $ +You should have received a copy of the GNU General Public License +along with the OCT6100 GPL API; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +$Octasic_Release: OCT612xAPI-01.00-PR43 $ + +$Octasic_Revision: 18 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTTYPE_H__ @@ -52,6 +62,7 @@ typedef signed short *PINT16; /* 8-bit integer */ typedef unsigned char UINT8; typedef signed char INT8; +typedef signed char OCT_INT8; typedef unsigned char *PUINT8; typedef signed char *PINT8; diff --git a/include/octtypevx.h b/include/octtypevx.h index e4c79dd..e8936c5 100644 --- a/include/octtypevx.h +++ b/include/octtypevx.h @@ -2,20 +2,29 @@ File: octtypevx.h -Copyright (c) 2001 Octasic Inc. All rights reserved. + Copyright (c) 2001-2006 Octasic Inc. -Description: This file defines the base storage types for the VxWorks - environment. +Description: -This source code is Octasic Confidential. Use of and access to this code -is covered by the Octasic Device Enabling Software License Agreement. -Acknowledgement of the Octasic Device Enabling Software License was -required for access to this code. A copy was also provided with the release. + This file defines the base storage types for the VxWorks environment. +This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API is +free software; you can redistribute it and/or modify it under the terms of +the GNU General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. -$Octasic_Release: OCT610xAPI-01.00-PR37 $ +The OCT6100 GPL API is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -$Octasic_Revision: 5 $ +You should have received a copy of the GNU General Public License +along with the OCT6100 GPL API; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +$Octasic_Release: OCT612xAPI-01.00-PR43 $ + +$Octasic_Revision: 8 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -71,6 +80,7 @@ typedef char CHAR; typedef char * PCHAR; typedef CHAR SZ; typedef CHAR * PSZ; +typedef signed char OCT_INT8; /* Double integers */ typedef double DOUBLE; diff --git a/include/octtypewin.h b/include/octtypewin.h index e87e0ba..3456db3 100644 --- a/include/octtypewin.h +++ b/include/octtypewin.h @@ -2,21 +2,30 @@ File: octtypewin.h -Copyright (c) 2001 Octasic Inc. All rights reserved. + Copyright (c) 2001-2006 Octasic Inc. -Description: This file defines the base storage types for the Windows - environment. - Includes the Windows definition file and add the missing ones here. +Description: -This source code is Octasic Confidential. Use of and access to this code -is covered by the Octasic Device Enabling Software License Agreement. -Acknowledgement of the Octasic Device Enabling Software License was -required for access to this code. A copy was also provided with the release. + This file defines the base storage types for the Windows environment. + Includes the Windows definition file and add the missing ones here. +This file is part of the Octasic OCT6100 GPL API . The OCT6100 GPL API is +free software; you can redistribute it and/or modify it under the terms of +the GNU General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. -$Octasic_Release: OCT610xAPI-01.00-PR37 $ +The OCT6100 GPL API is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -$Octasic_Revision: 12 $ +You should have received a copy of the GNU General Public License +along with the OCT6100 GPL API; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +$Octasic_Release: OCT612xAPI-01.00-PR43 $ + +$Octasic_Revision: 16 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -34,7 +43,6 @@ $Octasic_Revision: 12 $ /* Disable Level 4 warning: nonstandard extension used : translation unit is empty */ #pragma warning( disable : 4206 ) - #ifdef __cplusplus extern "C" { #endif @@ -48,11 +56,13 @@ typedef signed short *PINT16; /* 8-bit integer */ typedef unsigned char UINT8; typedef signed char INT8; +typedef signed char OCT_INT8; typedef unsigned char *PUINT8; typedef signed char *PINT8; typedef double DOUBLE; + /* 32 bit integer */ #if ( defined( _MSC_VER ) && _MSC_VER == 1100 ) /* MFC5 compiler does not define UINT32 */ @@ -68,6 +78,12 @@ typedef UINT32 * PUINT32; #define ULLONG unsigned __int64 #define PULLONG unsigned __int64 * +/* Double integers */ +typedef double DOUBLE; +typedef double * PDOUBLE; +typedef float FLOAT; +typedef float * PFLOAT; + #ifndef OPT #define OPT /* OPT param */ #endif @@ -10800,8 +10800,7 @@ static UINT32 Oct6100ApiCheckChipConfiguration( return cOCT6100_ERR_OPEN_MAX_RW_ACCESSES; /* Check the clocks. */ - if ( f_pChipOpen->ulUpclkFreq != cOCT6100_UPCLK_FREQ_33_33_MHZ && - f_pChipOpen->ulUpclkFreq != cOCT6100_UPCLK_FREQ_66_67_MHZ ) + if ( f_pChipOpen->ulUpclkFreq != cOCT6100_UPCLK_FREQ_33_33_MHZ ) return cOCT6100_ERR_OPEN_UP_CLK_FREQ; if ( f_pChipOpen->ulMemClkFreq != cOCT6100_MCLK_FREQ_133_MHZ && @@ -12234,21 +12233,7 @@ static UINT32 Oct6100ApiBootFc2Pll( /* Select upclk directly as ref source for fc2pll. */ WriteParams.ulWriteAddress = 0x134; - if ( pChipConfig->ulUpclkFreq == cOCT6100_UPCLK_FREQ_66_67_MHZ ) - { - WriteParams.usWriteData = 0x0002; - - mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; - - /* Remove the reset */ - WriteParams.usWriteData = 0x0102; - mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; - } - else /* pChipConfig->ulUpclkFreq == cOCT6100_UPCLK_FREQ_33_33_MHZ */ + if ( pChipConfig->ulUpclkFreq == cOCT6100_UPCLK_FREQ_33_33_MHZ ) { WriteParams.usWriteData = 0x0001; |