giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

code style fixes

Browse Source
This commit is contained in:
spoerk 2018-01-03 15:52:36 +01:00
parent 604e846ff1
commit f8d2c3fa48
3 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/cpu/cc26xx-cc13xx/ble-addr.h
View File

@ -60,7 +60,7 @@ void ble_addr_cpy_to(uint8_t *dst);
/*---------------------------------------------------------------------------*/
/**
* \brief Copy the node's BLE address to a destination memory area and converts
* it into a EUI64 address in the process
* it into a EUI64 address in the process
* \param dst A pointer to the destination area where the EUI64 address is to be
* written
* \param src A pointer to the BLE address that is to be copied
@ -70,7 +70,7 @@ void ble_addr_to_eui64(uint8_t *dst, uint8_t *src);
/*---------------------------------------------------------------------------*/
/**
* \brief Copy the node's EUI64 address that is based on its factory BLE address
* to a destination memory area
* to a destination memory area
* \param dst A pointer to the destination area where the EUI64 address is to be
* written
*/

44
arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/rf-ble-cmd.h
View File

@ -75,7 +75,7 @@ unsigned short rf_ble_cmd_setup_ble_mode(void);
/*---------------------------------------------------------------------------*/
/**
* \brief Creates a BLE radio command structure that enables
* BLE advertisement when sent to the radio core
* BLE advertisement when sent to the radio core
* \param command A pointer to command that is created
* \param channel The BLE advertisement channel used for advertisement
* \param param A pointer to the radio command parameters
@ -87,18 +87,18 @@ void rf_ble_cmd_create_adv_cmd(uint8_t *command, uint8_t channel,
/*---------------------------------------------------------------------------*/
/**
* \brief Creates BLE radio command parameters that are used to enable
* BLE advertisement on the radio core
* \param param A pointer to parameter structure that is created
* BLE advertisement on the radio core
* \param param A pointer to parameter structure that is created
* \param rx_queue A pointer to the RX queue that is used
* \param adv_data_len
* The length of the advertisement data
* The length of the advertisement data
* \param adv_data A pointer to the advertisement data that is advertised
* \param scan_resp_data_len
* The length of the scan response data
* The length of the scan response data
* \param scan_resp_data
* A pointer to the scan response data
* A pointer to the scan response data
* \param own_addr_type
* Either BLE_ADDR_TYPE_PUBLIC or BLE_ADDR_TYPE_RANDOM
* Either BLE_ADDR_TYPE_PUBLIC or BLE_ADDR_TYPE_RANDOM
* \param own_addr A pointer to the device address that is used as own address
*/
void rf_ble_cmd_create_adv_params(uint8_t *param, dataQueue_t *rx_queue,
@ -109,13 +109,13 @@ void rf_ble_cmd_create_adv_params(uint8_t *param, dataQueue_t *rx_queue,
/*---------------------------------------------------------------------------*/
/**
* \brief Creates a BLE radio command structure that sets up a single
* BLE connection event when sent to the radio core
* \param cmd A pointer to command that is created
* BLE connection event when sent to the radio core
* \param cmd A pointer to command that is created
* \param channel The BLE data channel used for the connection event
* \param param A pointer to the radio command parameters
* \param output A pointer to the radio command output
* \param start_time
* The time in rf_core_ticks when the connection event will start
* The time in rf_core_ticks when the connection event will start
*/
void rf_ble_cmd_create_slave_cmd(uint8_t *cmd, uint8_t channel, uint8_t *params,
uint8_t *output, uint32_t start_time);
@ -123,26 +123,26 @@ void rf_ble_cmd_create_slave_cmd(uint8_t *cmd, uint8_t channel, uint8_t *params,
/*---------------------------------------------------------------------------*/
/**
* \brief Creates BLE radio command parameters that are used to setup a single
* BLE connection event on the radio core
* \param param A pointer to parameter structure that is created
* BLE connection event on the radio core
* \param param A pointer to parameter structure that is created
* \param rx_queue A pointer to the RX queue that is used
* \param tx_queue A pointer to the TX queue that is used
* \param access_address
* The access address of the used BLE connection
* The access address of the used BLE connection
* \param crc_init_0
* Part of the initialization of the CRC checksum
* Part of the initialization of the CRC checksum
* \param crc_init_1
* Part of the initialization of the CRC checksum
* Part of the initialization of the CRC checksum
* \param crc_init_2
* Part of the initialization of the CRC checksum
* Part of the initialization of the CRC checksum
* \param win_size The window size parameter of the BLE connection event
* \param window_widening
* The window widening parameter used for this connection event
* The window widening parameter used for this connection event
* \param first_packet
* 1 for the first packet of the BLE connection so that the
* connection is properly initialized
* 1 for the first packet of the BLE connection so that the
* connection is properly initialized
*/
void rf_ble_cmd_create_slave_params(uint8_t *params, dataQueue_t *rx_queue,
void rf_ble_cmd_create_slave_params(uint8_t *param, dataQueue_t *rx_queue,
dataQueue_t *tx_queue, uint32_t access_address,
uint8_t crc_init_0, uint8_t crc_init_1,
uint8_t crc_init_2, uint32_t win_size,
@ -151,8 +151,8 @@ void rf_ble_cmd_create_slave_params(uint8_t *params, dataQueue_t *rx_queue,
/*---------------------------------------------------------------------------*/
/**
* \brief Adds a data buffer to a BLE transmission queue
* \param q A pointer to BLE transmission queue where the buffer
* should be added
* \param q A pointer to BLE transmission queue where the buffer
* should be added
* \param e A pointer to the data buffer that is added
*/
unsigned short rf_ble_cmd_add_data_queue_entry(dataQueue_t *q, uint8_t *e);

28
os/net/netstack.h
View File

@ -69,7 +69,7 @@
#elif MAC_CONF_WITH_TSCH
#define NETSTACK_MAC tschmac_driver
#elif MAC_CONF_WITH_BLE
#define NETSTACK_MAC ble_l2cap_driver
#define NETSTACK_MAC ble_l2cap_driver
#else
#error Unknown MAC configuration
#endif
@ -102,24 +102,22 @@ struct network_driver {
char *name;
/** Initialize the network driver */
void (* init)(void);
void (*init)(void);
/** Callback for getting notified of incoming packet in packetbuf. */
void (* input)(void);
void (*input)(void);
/** Output funtion, sends from uipbuf. */
uint8_t (* output)(const linkaddr_t *localdest);
uint8_t (*output)(const linkaddr_t *localdest);
};
extern const struct network_driver NETSTACK_NETWORK;
extern const struct mac_driver NETSTACK_MAC;
extern const struct radio_driver NETSTACK_RADIO;
extern const struct framer NETSTACK_FRAMER;
extern const struct mac_driver NETSTACK_MAC;
extern const struct radio_driver NETSTACK_RADIO;
extern const struct framer NETSTACK_FRAMER;
void netstack_init(void);
/* Netstack ip_packet_processor - for implementing packet filters, firewalls,
debuggin info, etc */
@ -135,8 +133,8 @@ enum netstack_ip_callback_type {
struct netstack_ip_packet_processor {
struct netstack_ip_packet_processor *next;
enum netstack_ip_action (* process_input)(void);
enum netstack_ip_action (* process_output)(const linkaddr_t *localdest);
enum netstack_ip_action (*process_input)(void);
enum netstack_ip_action (*process_output)(const linkaddr_t * localdest);
};
/* This function is intended for the IP stack to call whenever input/output
@ -146,18 +144,16 @@ enum netstack_ip_action netstack_process_ip_callback(uint8_t type, const linkadd
void netstack_ip_packet_processor_add(struct netstack_ip_packet_processor *p);
void netstack_ip_packet_processor_remove(struct netstack_ip_packet_processor *p);
/* Netstack sniffer - this will soon be deprecated... */
struct netstack_sniffer {
struct netstack_sniffer *next;
void (* input_callback)(void);
void (* output_callback)(int mac_status);
void (*input_callback)(void);
void (*output_callback)(int mac_status);
};
#define NETSTACK_SNIFFER(name, input_callback, output_callback) \
static struct netstack_sniffer name = { NULL, input_callback, output_callback }
static struct netstack_sniffer name = { NULL, input_callback, output_callback }
void netstack_sniffer_add(struct netstack_sniffer *s);
void netstack_sniffer_remove(struct netstack_sniffer *s);