Skip to content

Commit 95f635f

Browse files
authoredAug 14, 2017
Merge pull request #4895 from c1728p9/device_has_doxygen
Turn on doxygen for DEVICE_* features
2 parents 878557e + 026df0b commit 95f635f

File tree

5 files changed

+34
-4
lines changed

5 files changed

+34
-4
lines changed
 

‎doxyfile_options

+26-1
Original file line numberDiff line numberDiff line change
@@ -2056,7 +2056,32 @@ INCLUDE_FILE_PATTERNS =
20562056
# recursively expanded use the := operator instead of the = operator.
20572057
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
20582058

2059-
PREDEFINED = DOXYGEN_ONLY \
2059+
PREDEFINED = DOXYGEN_ONLY \
2060+
DEVICE_ANALOGIN \
2061+
DEVICE_ANALOGOUT \
2062+
DEVICE_CAN \
2063+
DEVICE_ETHERNET \
2064+
DEVICE_EMAC \
2065+
DEVICE_FLASH \
2066+
DEVICE_I2C \
2067+
DEVICE_I2CSLAVE \
2068+
DEVICE_I2C_ASYNCH \
2069+
DEVICE_INTERRUPTIN \
2070+
DEVICE_LOWPOWERTIMER \
2071+
DEVICE_PORTIN \
2072+
DEVICE_PORTINOUT \
2073+
DEVICE_PORTOUT \
2074+
DEVICE_PWMOUT \
2075+
DEVICE_RTC \
2076+
DEVICE_TRNG \
2077+
DEVICE_SERIAL \
2078+
DEVICE_SERIAL_ASYNCH \
2079+
DEVICE_SERIAL_FC \
2080+
DEVICE_SLEEP \
2081+
DEVICE_SPI \
2082+
DEVICE_SPI_ASYNCH \
2083+
DEVICE_SPISLAVE \
2084+
DEVICE_STORAGE \
20602085
"MBED_DEPRECATED_SINCE(d, m)=" \
20612086
"MBED_ENABLE_IF_CALLBACK_COMPATIBLE(F, M)="
20622087

‎doxygen_options.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"SEARCH_INCLUDES": "YES",
66
"INCLUDE_PATH": "",
77
"INCLUDE_FILE_PATTERNS": "",
8-
"PREDEFINED": "DOXYGEN_ONLY \"MBED_DEPRECATED_SINCE(f, g)=\" \"MBED_ENABLE_IF_CALLBACK_COMPATIBLE(F, M)=\"",
8+
"PREDEFINED": "DOXYGEN_ONLY DEVICE_ANALOGIN DEVICE_ANALOGOUT DEVICE_CAN DEVICE_ETHERNET DEVICE_EMAC DEVICE_FLASH DEVICE_I2C DEVICE_I2CSLAVE DEVICE_I2C_ASYNCH DEVICE_INTERRUPTIN DEVICE_LOWPOWERTIMER DEVICE_PORTIN DEVICE_PORTINOUT DEVICE_PORTOUT DEVICE_PWMOUT DEVICE_RTC DEVICE_TRNG DEVICE_SERIAL DEVICE_SERIAL_ASYNCH DEVICE_SERIAL_FC DEVICE_SLEEP DEVICE_SPI DEVICE_SPI_ASYNCH DEVICE_SPISLAVE DEVICE_STORAGE \"MBED_DEPRECATED_SINCE(f, g)=\" \"MBED_ENABLE_IF_CALLBACK_COMPATIBLE(F, M)=\"",
99
"EXPAND_AS_DEFINED": "",
1010
"SKIP_FUNCTION_MACROS": "NO",
1111
"EXCLUDE_PATTERNS": "*/tools/* */TESTS/* */targets/* */FEATURE_*/* */features/mbedtls/* */features/storage/* */features/unsupported/* */features/filesystem/* */BUILD/* */rtos/rtx*/* */cmsis/* */features/FEATURES_*"

‎features/netsocket/emac_stack_mem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void emac_stack_mem_set_len(emac_stack_t* stack, emac_stack_mem_t *mem, uint32_t
8989
* Returns first memory structure from the list and move the head to point to the next node
9090
*
9191
* @param stack Emac stack context
92-
* @param list Pointer to the list
92+
* @param chain Pointer to the list
9393
* @return First memory structure from the list
9494
*/
9595
emac_stack_mem_t *emac_stack_mem_chain_dequeue(emac_stack_t* stack, emac_stack_mem_chain_t **chain);

‎hal/flash_api.h

-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address);
9898
/** Get page size
9999
*
100100
* @param obj The flash object
101-
* @param address The page starting address
102101
* @return The size of a page
103102
*/
104103
uint32_t flash_get_page_size(const flash_t *obj);

‎hal/i2c_api.h

+6
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ int i2c_byte_write(i2c_t *obj, int data);
156156

157157
/** Configure I2C as slave or master.
158158
* @param obj The I2C object
159+
* @param enable_slave Enable i2c hardware so you can receive events with ::i2c_slave_receive
159160
* @return non-zero if a value is available
160161
*/
161162
void i2c_slave_mode(i2c_t *obj, int enable_slave);
@@ -169,12 +170,16 @@ int i2c_slave_receive(i2c_t *obj);
169170

170171
/** Configure I2C as slave or master.
171172
* @param obj The I2C object
173+
* @param data The buffer for receiving
174+
* @param length Number of bytes to read
172175
* @return non-zero if a value is available
173176
*/
174177
int i2c_slave_read(i2c_t *obj, char *data, int length);
175178

176179
/** Configure I2C as slave or master.
177180
* @param obj The I2C object
181+
* @param data The buffer for sending
182+
* @param length Number of bytes to write
178183
* @return non-zero if a value is available
179184
*/
180185
int i2c_slave_write(i2c_t *obj, const char *data, int length);
@@ -208,6 +213,7 @@ void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask);
208213
* @param address The address to be set - 7bit or 9bit
209214
* @param stop If true, stop will be generated after the transfer is done
210215
* @param handler The I2C IRQ handler to be set
216+
* @param event Event mask for the transfer. See \ref hal_I2CEvents
211217
* @param hint DMA hint usage
212218
*/
213219
void i2c_transfer_asynch(i2c_t *obj, const void *tx, size_t tx_length, void *rx, size_t rx_length, uint32_t address, uint32_t stop, uint32_t handler, uint32_t event, DMAUsage hint);

0 commit comments

Comments
 (0)