diff options
| -rw-r--r-- | include/bt_target.h | 10 | ||||
| -rw-r--r-- | include/bt_trace.h | 1 | ||||
| -rw-r--r-- | main/bte_init.c | 10 | ||||
| -rw-r--r-- | main/bte_logmsg.c | 8 | ||||
| -rw-r--r-- | stack/include/bt_types.h | 1 | ||||
| -rw-r--r-- | stack/include/dyn_mem.h | 4 | ||||
| -rw-r--r-- | stack/include/goep_fs.h | 393 |
7 files changed, 2 insertions, 425 deletions
diff --git a/include/bt_target.h b/include/bt_target.h index 139059ce6..474123936 100644 --- a/include/bt_target.h +++ b/include/bt_target.h @@ -1684,16 +1684,6 @@ Note: This pool needs to have enough buffers to hold two times the window size /****************************************************************************** ** -** GOEP -** -******************************************************************************/ - -#ifndef GOEP_INCLUDED -#define GOEP_INCLUDED FALSE -#endif - -/****************************************************************************** -** ** OPP ** ******************************************************************************/ diff --git a/include/bt_trace.h b/include/bt_trace.h index 5c9a3248f..37e7d7e67 100644 --- a/include/bt_trace.h +++ b/include/bt_trace.h @@ -51,7 +51,6 @@ #define BTTRC_ID_STK_FTC 27 #define BTTRC_ID_STK_FTS 28 #define BTTRC_ID_STK_GAP 29 -#define BTTRC_ID_STK_GOEP 30 #define BTTRC_ID_STK_HCRP 31 #define BTTRC_ID_STK_ICP 32 #define BTTRC_ID_STK_OPC 33 diff --git a/main/bte_init.c b/main/bte_init.c index 6aa07bdde..0fb0c7389 100644 --- a/main/bte_init.c +++ b/main/bte_init.c @@ -67,10 +67,6 @@ #include "dun_api.h" #endif -#if (defined(GOEP_INCLUDED) && GOEP_INCLUDED == TRUE) -#include "goep_util.h" -#endif /* GOEP included */ - #if (defined(OPP_INCLUDED) && OPP_INCLUDED == TRUE) #include "opp_api.h" #endif /* OPP */ @@ -324,11 +320,6 @@ void BTE_InitStack(void) #endif /* BTA BI */ #endif /* BIP */ -#if (defined(GOEP_INCLUDED) && GOEP_INCLUDED == TRUE) - GOEP_Init(); -#endif /* GOEP */ - - #if (defined(OPP_INCLUDED) && OPP_INCLUDED == TRUE) OPP_Init(); #endif @@ -507,4 +498,5 @@ void BTE_InitStack(void) #endif /* BTA_INCLUDED == TRUE */ // btla-specific -- + } diff --git a/main/bte_logmsg.c b/main/bte_logmsg.c index b052d5476..9733183b3 100644 --- a/main/bte_logmsg.c +++ b/main/bte_logmsg.c @@ -71,9 +71,6 @@ #if (GAP_INCLUDED==TRUE) #include "gap_api.h" #endif -#if (GOEP_INCLUDED==TRUE) -#include "goep_util.h" -#endif #if (HCRP_INCLUDED==TRUE) #include "hcrp_api.h" #endif @@ -122,7 +119,7 @@ static const char * const bt_layer_tags[] = { "bt-btm", "bt-gap", "bt-dun", - "bt-goep", + "UNUSED", "bt-icp", "bt-hsp2", "bt-spp", @@ -201,9 +198,6 @@ static tBTTRC_FUNC_MAP bttrc_set_level_map[] = { #if (GAP_INCLUDED==TRUE) {BTTRC_ID_STK_GAP, BTTRC_ID_STK_GAP, GAP_SetTraceLevel, "TRC_GAP", DEFAULT_CONF_TRACE_LEVEL}, #endif -#if (GOEP_INCLUDED==TRUE) - {BTTRC_ID_STK_GOEP, BTTRC_ID_STK_GOEP, GOEP_SetTraceLevel, "TRC_GOEP", DEFAULT_CONF_TRACE_LEVEL}, -#endif #if (HCRP_INCLUDED==TRUE) {BTTRC_ID_STK_HCRP, BTTRC_ID_STK_HCRP, HCRP_SetTraceLevel, "TRC_HCRP", DEFAULT_CONF_TRACE_LEVEL}, #endif diff --git a/stack/include/bt_types.h b/stack/include/bt_types.h index 5afca0cfe..65c9fcc38 100644 --- a/stack/include/bt_types.h +++ b/stack/include/bt_types.h @@ -566,7 +566,6 @@ typedef UINT8 tBT_DEVICE_TYPE; #define TRACE_LAYER_BTM 0x000d0000 #define TRACE_LAYER_GAP 0x000e0000 #define TRACE_LAYER_DUN 0x000f0000 -#define TRACE_LAYER_GOEP 0x00100000 #define TRACE_LAYER_ICP 0x00110000 #define TRACE_LAYER_HSP2 0x00120000 #define TRACE_LAYER_SPP 0x00130000 diff --git a/stack/include/dyn_mem.h b/stack/include/dyn_mem.h index a58d60ef4..d1cfbcf8a 100644 --- a/stack/include/dyn_mem.h +++ b/stack/include/dyn_mem.h @@ -119,10 +119,6 @@ #define FTP_DYNAMIC_MEMORY FALSE #endif -#ifndef GOEP_DYNAMIC_MEMORY -#define GOEP_DYNAMIC_MEMORY FALSE -#endif - #ifndef HCRP_DYNAMIC_MEMORY #define HCRP_DYNAMIC_MEMORY FALSE #endif diff --git a/stack/include/goep_fs.h b/stack/include/goep_fs.h deleted file mode 100644 index e45f09dc0..000000000 --- a/stack/include/goep_fs.h +++ /dev/null @@ -1,393 +0,0 @@ -/****************************************************************************** - * - * Copyright (C) 2000-2012 Broadcom Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************************/ -#ifndef GOEP_FS_H -#define GOEP_FS_H - -#include "bt_target.h" - -/***************************************************************************** -** Constants -*****************************************************************************/ - -/* Flags passed to the open function (tGOEP_OPEN_CBACK) -** Values are OR'd together. (First 3 are -** mutually exclusive. -*/ -#define GOEP_O_RDONLY 0x0000 -#define GOEP_O_WRONLY 0x0001 -#define GOEP_O_RDWR 0x0002 - -#define GOEP_O_CREAT 0x0100 -#define GOEP_O_EXCL 0x0200 -#define GOEP_O_TRUNC 0x1000 - - -#define GOEP_LEN_UNKNOWN 0xFFFFFFFF -#define GOEP_INVALID_FD (-1) - -/* Values passed to the access function (tGOEP_ACCESS_CBACK) -*/ -#define GOEP_ACC_EXIST 0x0 -#define GOEP_ACC_READ 0x4 -#define GOEP_ACC_RDWR 0x6 - -/* Constants used in directory listing structure */ -#define GOEP_A_RDONLY 0x1 -#define GOEP_A_DIR 0x2 /* Entry is a sub directory */ - -#define GOEP_CTIME_LEN 17 /* Creation time "yyyymmddTHHMMSSZ" */ - -/***************************************************************************** -** Seek Constants -*****************************************************************************/ -/* Origin for the seek function (tGOEP_SEEK_CBACK) */ -#define GOEP_SEEK_SET 0 -#define GOEP_SEEK_CUR 1 -#define GOEP_SEEK_END 2 - - - -/***************************************************************************** -** Typedefs -*****************************************************************************/ -typedef INT32 tGOEP_FD; - -enum -{ - GOEP_OK, - GOEP_FAIL, - GOEP_EACCES, - GOEP_ENOTEMPTY, - GOEP_EOF, - GOEP_EODIR, - GOEP_ENOSPACE, - GOEP_EIS_DIR, - GOEP_RESUME, - GOEP_NONE -}; -typedef UINT16 tGOEP_STATUS; - -/* Structure passed in Directory Entry Callback to be filled in */ -typedef struct -{ - UINT32 refdata; /* holder for OS specific data used to get next entry */ - UINT32 filesize; - char crtime[GOEP_CTIME_LEN]; /* "yyyymmddTHHMMSSZ", or "" if none */ - char *p_name; /* Contains the addr of memory to copy name into */ - UINT8 mode; /* GOEP_A_RDONLY and/or GOEP_A_DIR */ -} tGOEP_DIRENTRY; - - -/***************************************************************************** -** Typedefs for messages from response functions -*****************************************************************************/ -typedef struct -{ - BT_HDR hdr; - tGOEP_FD fd; - tGOEP_STATUS status; - UINT32 file_size; -} tGOEP_OPEN_RSP; - -typedef struct -{ - BT_HDR hdr; - tGOEP_FD fd; - tGOEP_STATUS status; - UINT16 bytes_read; -} tGOEP_READ_RSP; - -typedef struct -{ - BT_HDR hdr; - tGOEP_FD fd; - tGOEP_STATUS status; -} tGOEP_WRITE_RSP; - -typedef struct -{ - BT_HDR hdr; - tGOEP_STATUS status; -} tGOEP_DIRENTRY_RSP; - -/***************************************************************************** -** Object Store Interface -*****************************************************************************/ -/******************************************************************************* -** -** Callback Function: tGOEP_OPEN_CBACK -** -** Description This function is executed by OBX profiles to open -** a file for reading or writing. -** -** Parameters p_path - Fully qualified path and file name. -** flags - permissions and mode (see constants above) -** size - size of file to put (0 if unavailable or not applicable) -** event_id - code that must be passed to the call-in function. -** -** Returns void -** -** Note: Upon completion of the request, a file descriptor (tGOEP_FD), -** file size (UINT32), and an status code (tGOEP_STATUS) -** are returned in GOEP_OpenRsp(). -** -*******************************************************************************/ -typedef void (tGOEP_OPEN_CBACK) (const UINT8 *p_name, UINT16 flags, UINT32 size, - UINT16 event_id, UINT8 app_id); - -/******************************************************************************* -** -** Callback Function: tGOEP_CLOSE_CBACK -** -** Description This function is executed by OBX profiles when the file descriptor -** is no longer in use. -** -** Returns void -** -*******************************************************************************/ -typedef void (tGOEP_CLOSE_CBACK) (tGOEP_FD fd, UINT8 app_id); - -/******************************************************************************* -** -** Callback Function: tGOEP_READ_CBACK -** -** Description This function is executed by OBX profiles to read in data from the -** previously opened file. -** -** Returns void -** -** Note: Upon completion of the request, GOEP_ReadRsp() is -** called with the buffer of data, along with the number -** of bytes read into the buffer, and a status. The -** call-in function should only be called when ALL requested -** bytes have been read, the end of file has been detected, -** or an error has occurred. -** -*******************************************************************************/ -typedef void (tGOEP_READ_CBACK) (tGOEP_FD fd, void *p_data, INT16 size, - UINT16 event_id, UINT8 app_id); - -/******************************************************************************* -** -** Callback Function: tGOEP_WRITE_CBACK -** -** Description This function is executed by OBX profiles to write the data to the -** previously opened file. -** -** Returns void -** -** Note: Upon completion of the request, GOEP_WriteRsp() is -** called with the file descriptor and the status. The -** call-in function should only be called when ALL requested -** bytes have been written, or an error has been detected, -** -*******************************************************************************/ -typedef void (tGOEP_WRITE_CBACK) (tGOEP_FD fd, const void *p_data, INT16 size, - UINT16 event_id, UINT8 app_id); - -/******************************************************************************* -** -** Callback Function: tGOEP_SEEK_CBACK -** -** Description This function is executed by OBX profiles to Move a file pointer -** of a previously opened file to the specified location for the -** next read or write operation. -** -** Returns void -** -*******************************************************************************/ -typedef void (tGOEP_SEEK_CBACK) (tGOEP_FD fd, INT32 offset, INT16 origin, UINT8 app_id); - - -/******************************************************************************* -** -** Callback Function: tGOEP_DIRENTRY_CBACK -** -** Description This function is called to retrieve a directory entry for the -** specified path. The first/next directory should be filled -** into the location specified by p_entry. -** -** Parameters p_path - directory to search (Fully qualified path) -** first_item - TRUE if first search, FALSE if next search -** (p_cur contains previous) -** p_entry (input/output) - Points to last entry data (valid when -** first_item is FALSE) -** event_id - event that must be passed into the call-in function. -** -** Returns void -** -** Note: Upon completion of the request, GOEP_DirentryRsp() is -** filled in entry and the status. -** GOEP_OK is returned when p_entry is valid, -** GOEP_EODIR is returned when no more entries [finished] -** GOEP_FAIL is returned if an error occurred -** -*******************************************************************************/ -typedef void (tGOEP_DIRENTRY_CBACK) (const char *p_path, BOOLEAN first_item, - tGOEP_DIRENTRY *p_entry, UINT16 event_id, - UINT8 app_id); - -/******************************************************************************* -** -** Callback Function: tGOEP_ACCESS_CBACK -** -** Description This function is called to check the existence of a file or -** directory. -** -** Returns (tGOEP_STATUS) status of the call. -** [GOEP_OK if it exists] -** [GOEP_EACCES if permissions are wrong] -** [GOEP_FAIL if it does not exist] -** -*******************************************************************************/ -typedef tGOEP_STATUS (tGOEP_ACCESS_CBACK) (const char *p_path, UINT16 mode, - BOOLEAN *p_is_dir, UINT8 app_id); - -/******************************************************************************* -** -** Callback Function: tGOEP_MKDIR_CBACK -** -** Description This function is called to create a directory with -** the pathname given by path. The pathname is a null terminated -** string. All components of the path must already exist. -** -** Parameters p_path - (input) name of directory to create (fully qualified path). -** -** Returns (tGOEP_STATUS) status of the call. -** [GOEP_OK if successful] -** [GOEP_FAIL if unsuccessful] -** -*******************************************************************************/ -typedef tGOEP_STATUS (tGOEP_MKDIR_CBACK) (const char *p_path, UINT8 app_id); - -/******************************************************************************* -** -** Callback Function: tGOEP_RMDIR_CBACK -** -** Description This function is called to remove a directory whose -** name is given by path. The directory must be empty. -** -** Parameters p_path - (input) name of directory to remove (fully qualified path). -** -** Returns (tGOEP_STATUS) status of the call. -** [GOEP_OK if successful] -** [GOEP_EACCES if read-only] -** [GOEP_ENOTEMPTY if directory is not empty] -** [GOEP_FAIL otherwise] -** -*******************************************************************************/ -typedef tGOEP_STATUS (tGOEP_RMDIR_CBACK) (const char *p_path, UINT8 app_id); - -/******************************************************************************* -** -** Callback Function: tGOEP_UNLINK_CBACK -** -** Description This function is called to remove a directory whose -** name is given by path. The directory must be empty. -** -** Parameters p_path - (input) name of file to remove (fully qualified path). -** -** Returns (tGOEP_STATUS) status of the call. -** [GOEP_OK if successful] -** [GOEP_EACCES if read-only] -** [GOEP_FAIL otherwise] -** -*******************************************************************************/ -typedef tGOEP_STATUS (tGOEP_UNLINK_CBACK) (const char *p_path, UINT8 app_id); - - -/***************************************************************************** -** Prototypes -*****************************************************************************/ - -#ifdef __cplusplus -extern "C" { -#endif - -/***************************************************************************** -** -** Function: GOEP_OpenRsp -** -** Purpose: Report the status of tGOEP_OPEN_CBACK callback function. -** -** Parameters: fd - File handle. -** status - Status of the operation. -** file_size - total number of bytes in this file. -** event_id - event id as given in the tGOEP_OPEN_CBACK function. -** -** Returns: void -** -*****************************************************************************/ -extern void GOEP_OpenRsp (tGOEP_FD fd, tGOEP_STATUS status, - UINT32 file_size, UINT16 event_id); - -/***************************************************************************** -** -** Function: GOEP_ReadRsp -** -** Purpose: Report the status of tGOEP_READ_CBACK callback function. -** -** Parameters: fd - File handle. -** status - Status of the operation. -** bytes_read - total number of bytes read from the file. -** event_id - event id as given in the tGOEP_READ_CBACK function. -** -** Returns: void -** -*****************************************************************************/ -extern void GOEP_ReadRsp (tGOEP_FD fd, tGOEP_STATUS status, - UINT16 bytes_read, UINT16 event_id); - -/***************************************************************************** -** -** Function: GOEP_WriteRsp -** -** Purpose: Report the status of tGOEP_WRITE_CBACK callback function. -** -** Parameters: fd - File handle. -** status - Status of the operation. -** event_id - event id as given in the tGOEP_WRITE_CBACK function. -** -** Returns: void -** -*****************************************************************************/ -extern void GOEP_WriteRsp (tGOEP_FD fd, tGOEP_STATUS status, UINT16 event_id); - -/******************************************************************************* -** -** Function GOEP_DirentryRsp -** -** Description This function is called in response to the -** tGOEP_DIRENTRY_CBACK function with a filled in directory listing -** entry. -** -** Parameters status - GOEP_OK if p_entry points to a valid entry. -** GOEP_EODIR if no more entries (p_entry is ignored). -** GOEP_FAIL if any errors have occurred. -** event_id - event id as given in the tGOEP_DIRENTRY_CBACK function. -** -** Returns void -** -*******************************************************************************/ -extern void GOEP_DirentryRsp(tGOEP_STATUS status, UINT16 event_id); - -#ifdef __cplusplus -} -#endif - -#endif /* GOEP_FS_H */ |