Skip to content

Commit 82ec945

Browse files
Merge doxygen patch into v1.4.0 version (#186)
* Enable typedef to make docs able to link *_t structs. (#185) * Replace Synopsys link with blackduck one to solve link error. (#180) * Fix freertos.org link in the source and doxygen files (#177) --------- Co-authored-by: chinglee-iot <[email protected]>
1 parent 4301355 commit 82ec945

File tree

8 files changed

+27
-20
lines changed

8 files changed

+27
-20
lines changed

docs/doxygen/config.doxyfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ ALIASES = "dependencies_section{1}=@section \1_dependencies Depen
299299
"enums_brief{1}=@brief Enumerated types of the \1." \
300300
"functionpointers_group{2}=@defgroup \1_datatypes_functionpointers \2 Function pointer types" \
301301
"functionpointers_brief{1}=@brief Function pointer types of the \1." \
302-
"structs_group{21}=@defgroup \1_datatypes_structs \2 Structured types" \
302+
"structs_group{2}=@defgroup \1_datatypes_structs \2 Structured types" \
303303
"structs_brief{1}=@brief Structured types of the \1." \
304304
"paramstructs_group{2}=@defgroup \1_datatypes_paramstructs \2 Parameter structures" \
305305
"paramstructs_brief{2}=@brief Structures passed as parameters to [\2 functions](@ref \1_functions)<br>These structures are passed as parameters to library functions. Documentation for these structures will state the functions associated with each parameter structure and the purpose of each member." \
@@ -478,7 +478,7 @@ INLINE_SIMPLE_STRUCTS = NO
478478
# types are typedef'ed and only the typedef is referenced, never the tag name.
479479
# The default value is: NO.
480480

481-
TYPEDEF_HIDES_STRUCT = YES
481+
TYPEDEF_HIDES_STRUCT = NO
482482

483483
# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
484484
# cache is used to resolve symbols given their name and scope. Since this can be

docs/doxygen/pages.dox

+14-4
Original file line numberDiff line numberDiff line change
@@ -366,14 +366,14 @@ bool PlatformMutex_TryLock( PlatformMutex_t * pMutex );
366366
void PlatformMutex_Unlock( PlatformMutex_t * pMutex );
367367
```
368368
- <b>Memory</b><br>The following malloc/free style APIs should be provided in cellular_platform.h.<br>
369-
The <a href="https://www.freertos.org/a00111.html">FreeRTOS memory management document</a> can be referenced for these APIs.
369+
The <a href="https://freertos.org/Documentation/02-Kernel/02-Kernel-features/09-Memory-management/01-Memory-management">FreeRTOS memory management document</a> can be referenced for these APIs.
370370
```
371371
// Example implementation of FreeRTOS malloc/free
372372
#define Platform_Malloc pvPortMalloc
373373
#define Platform_Free vPortFree
374374
```
375375
- <b>EventGroup</b><br>The following APIs and handle should be provided in cellular_platform.h.<br>
376-
Please reference <a href="https://www.freertos.org/event-groups-API.html">FreeRTOS EvengGroup function prototypes</a>.
376+
Please reference <a href="https://freertos.org/Documentation/02-Kernel/04-API-references/12-Event-groups-or-flags/00-Event-groups">FreeRTOS EvengGroup function prototypes</a>.
377377
```
378378
// Example implementation of FreeRTOS EvengGroup
379379
#define PlatformEventGroupHandle_t EventGroupHandle_t
@@ -387,7 +387,7 @@ void PlatformMutex_Unlock( PlatformMutex_t * pMutex );
387387
#define PlatformEventGroup_WaitBits xEventGroupWaitBits
388388
```
389389
- <b>Queue</b><br>The following APIs and handle should be provided in cellular_platform.h.<br>
390-
Please reference <a href="https://freertos.org/a00018.html">FreeRTOS Queue function prototypes</a>.
390+
Please reference <a href="https://freertos.org/Documentation/02-Kernel/04-API-references/06-Queues/00-QueueManagement">FreeRTOS Queue function prototypes</a>.
391391
```
392392
// Example implementation of FreeRTOS Queue
393393
#define PlatformQueueHandle_t QueueHandle_t
@@ -397,13 +397,18 @@ void PlatformMutex_Unlock( PlatformMutex_t * pMutex );
397397
#define PlatformQueue_Delete vQueueDelete
398398
```
399399
- <b>Delay</b><br>The following API should be provided in cellular_platform.h.<br>
400-
Please reference <a href="https://www.freertos.org/a00127.html">FreeRTOS Task Control function prototypes</a>.
400+
Please reference <a href="https://freertos.org/Documentation/02-Kernel/04-API-references/02-Task-control/00-Task-control">FreeRTOS Task Control function prototypes</a>.
401401
```
402402
// Example implementation of FreeRTOS Task Control
403403
#define Platform_Delay( delayMs ) vTaskDelay( pdMS_TO_TICKS( delayMs ) )
404404
```
405405
*/
406406

407+
/**
408+
* @structs_group{cellular,Cellular}
409+
* @structs_brief{cellular,cellular}
410+
*/
411+
407412
/**
408413
* @paramstructs_group{cellular,Cellular}
409414
* @paramstructs_brief{cellular,cellular}
@@ -423,3 +428,8 @@ void PlatformMutex_Unlock( PlatformMutex_t * pMutex );
423428
* @enums_group{cellular,Cellular}
424429
* @enums_brief{cellular library}
425430
*/
431+
432+
/**
433+
* @common_datatypes_paramstructs_group{cellular,Cellular}
434+
* @common_datatypes_paramstructs_brief{cellular library}
435+
*/

source/include/cellular_types.h

-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@
5454
*/
5555
#define CELLULAR_INVALID_SIGNAL_BAR_VALUE ( 0xFFU )
5656

57-
/**
58-
* @ingroup cellular_datatypes_handles
59-
* @brief Opaque Cellular context structure.
60-
*/
6157
struct CellularContext;
6258

6359
/**

source/include/common/cellular_common.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
/*-----------------------------------------------------------*/
5656

5757
/**
58-
* @ingroup cellular_common_datatypes_paramstructs
58+
* @ingroup cellular_datatypes_paramstructs
5959
* @brief The AT command request structure.
6060
*/
6161
typedef struct CellularAtReq
@@ -69,7 +69,7 @@ typedef struct CellularAtReq
6969
} CellularAtReq_t;
7070

7171
/**
72-
* @ingroup cellular_common_datatypes_paramstructs
72+
* @ingroup cellular_datatypes_paramstructs
7373
* @brief The data command request structure.
7474
*/
7575
typedef struct CellularAtDataReq
@@ -94,7 +94,7 @@ typedef void ( * CellularAtParseTokenHandler_t )( CellularContext_t * pContext,
9494
char * pInputStr );
9595

9696
/**
97-
* @ingroup cellular_common_datatypes_paramstructs
97+
* @ingroup cellular_datatypes_paramstructs
9898
* @brief the URC token and URC handler mapping structure used by pkthandler.
9999
*/
100100
typedef struct CellularAtParseTokenMap
@@ -116,7 +116,7 @@ typedef enum CellularSocketState
116116
} CellularSocketState_t;
117117

118118
/**
119-
* @ingroup cellular_common_datatypes_paramstructs
119+
* @ingroup cellular_datatypes_paramstructs
120120
* @brief Parameters involved in sending/receiving data through sockets.
121121
*/
122122
typedef struct CellularSocketContext
@@ -151,7 +151,7 @@ typedef struct CellularSocketContext
151151
} CellularSocketContext_t;
152152

153153
/**
154-
* @ingroup cellular_common_datatypes_paramstructs
154+
* @ingroup cellular_datatypes_paramstructs
155155
* @brief Parameters to setup pktio and pkthandler token tables.
156156
*/
157157
typedef struct CellularTokenTable

source/interface/cellular_comm_interface.h

+1
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ typedef CellularCommInterfaceError_t ( * CellularCommInterfaceRecv_t )( Cellular
151151
typedef CellularCommInterfaceError_t ( * CellularCommInterfaceClose_t )( CellularCommInterfaceHandle_t commInterfaceHandle );
152152

153153
/**
154+
* @ingroup cellular_datatypes_paramstructs
154155
* @brief Represents the functions of a comm interface.
155156
*
156157
* Functions of these signature should be implemented against a comm interface

test/cbmc/include/cellular_platform.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* Cellular library use platform event group for process synchronization.
4242
*
4343
* The EventGroup functions in the following link can be referenced as function prototype.
44-
* https://www.freertos.org/event-groups-API.html
44+
* https://freertos.org/Documentation/02-Kernel/04-API-references/12-Event-groups-or-flags/00-Event-groups
4545
*
4646
*/
4747

@@ -236,7 +236,7 @@ uint16_t PlatformEventGroup_GetBits( PlatformEventGroupHandle_t groupEvent );
236236
*
237237
* Cellular library use platform memory allocation APIs to allocate memory dynamically.
238238
* The FreeRTOS memory management document can be referenced for these APIs.
239-
* https://www.freertos.org/a00111.html
239+
* https://freertos.org/Documentation/02-Kernel/02-Kernel-features/09-Memory-management/01-Memory-management
240240
*
241241
*/
242242

test/unit-test/cellular_platform.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
*
7979
* Cellular library use platform memory allocation APIs to allocate memory dynamically.
8080
* The FreeRTOS memory management document can be referenced for these APIs.
81-
* https://www.freertos.org/a00111.html
81+
* https://freertos.org/Documentation/02-Kernel/02-Kernel-features/09-Memory-management/01-Memory-management
8282
*
8383
*/
8484

@@ -205,7 +205,7 @@ bool Platform_CreateDetachedThread( void ( * threadRoutine )( void * pArgument )
205205
* Cellular library use platform event group for process synchronization.
206206
*
207207
* The EventGroup functions in the following link can be referenced as function prototype.
208-
* https://www.freertos.org/event-groups-API.html
208+
* https://freertos.org/Documentation/02-Kernel/04-API-references/12-Event-groups-or-flags/00-Event-groups
209209
*
210210
*/
211211
bool PlatformMutex_Create( PlatformMutex_t * pNewMutex,

tools/coverity/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ see the [MISRA.md](https://github.com/FreeRTOS/FreeRTOS-Cellular-Interface/blob/
1212

1313
## Getting Started
1414
### Prerequisites
15-
You can run this on a platform supported by Coverity. The list and other details can be found [here](https://sig-docs.synopsys.com/polaris/topics/c_coverity-compatible-platforms.html).
15+
You can run this on a platform supported by Coverity. The list and other details can be found [here](https://documentation.blackduck.com/bundle/coverity-docs/page/deploy-install-guide/topics/supported_platforms_for_coverity_analysis.html).
1616
To compile and run the Coverity target successfully, you must have the following:
1717

1818
1. CMake version > 3.13.0 (You can check whether you have this by typing `cmake --version`)

0 commit comments

Comments
 (0)