michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/nble: Clean up & simplify IPC UART encoding

Browse source 
We can take advantage of the net_buf headroom. At the same time move
the necessary definition straight into uart.c and remove any unused
definitions.

Change-Id: I932bba2cfb11808aabce7bad09e41f94d073bb5b
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2016-02-11 11:35:03 +02:00 • committed by Gerrit Code Review
commit 9632d46ae7
2 changed files with 19 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

38
drivers/nble/uart.c
View file

@ -31,6 +31,15 @@
#include "uart.h" #include "uart.h"
#include "rpc.h" #include "rpc.h"
/**
* @note this structure must be self-aligned and self-packed
*/
struct ipc_uart_header {
uint16_t len; /**< Length of IPC message. */
uint8_t channel; /**< Channel number of IPC message. */
uint8_t src_cpu_id; /**< CPU id of IPC sender. */
} __packed;
/* TODO: check size */ /* TODO: check size */
#define NBLE_TX_BUF_COUNT 2 #define NBLE_TX_BUF_COUNT 2
#define NBLE_RX_BUF_COUNT 8 #define NBLE_RX_BUF_COUNT 8
@ -70,7 +79,7 @@ struct net_buf *rpc_alloc_cb(uint16_t length)
BT_DBG("length %u", length); BT_DBG("length %u", length);
buf = net_buf_get(&tx, 0); buf = net_buf_get(&tx, sizeof(struct ipc_uart_header));
if (!buf) { if (!buf) {
BT_ERR("Unable to get tx buffer"); BT_ERR("Unable to get tx buffer");
return NULL; return NULL;
@ -85,30 +94,21 @@ struct net_buf *rpc_alloc_cb(uint16_t length)
return buf; return buf;
} }
static void poll_out(const void *buf, size_t length)
{
const uint8_t *ptr = buf;
while (length--) {
uart_poll_out(nble_dev, *ptr++);
}
}
void rpc_transmit_cb(struct net_buf *buf) void rpc_transmit_cb(struct net_buf *buf)
{ {
struct ipc_uart_header hdr; struct ipc_uart_header *hdr;
BT_DBG("buf %p length %u", buf, buf->len); BT_DBG("buf %p length %u", buf, buf->len);
hdr.len = buf->len; hdr = net_buf_push(buf, sizeof(*hdr));
hdr.channel = 0; hdr->len = buf->len - sizeof(*hdr);
hdr.src_cpu_id = 0; hdr->channel = 0;
hdr->src_cpu_id = 0;
/* Send header */ while (buf->len) {
poll_out(&hdr, sizeof(hdr)); uart_poll_out(nble_dev, buf->data[0]);
net_buf_pull(buf, 1);
/* Send data */ }
poll_out(buf->data, buf->len);
net_buf_unref(buf); net_buf_unref(buf);
} }

31
drivers/nble/uart.h
View file

@ -21,37 +21,6 @@
*/ */
extern struct driver ipc_uart_ns16550_driver; extern struct driver ipc_uart_ns16550_driver;
enum IPC_UART_RESULT_CODES {
IPC_UART_ERROR_OK = 0,
IPC_UART_ERROR_DATA_TO_BIG,
/**< A transmission is already ongoing, message is NOT sent */
IPC_UART_TX_BUSY
};
/**
* Definitions valid for NONE sync IPC UART headers.
*/
/**
* @note this structure must be self-aligned and self-packed
*/
struct ipc_uart_header {
uint16_t len; /**< Length of IPC message. */
uint8_t channel; /**< Channel number of IPC message. */
uint8_t src_cpu_id; /**< CPU id of IPC sender. */
};
#define IPC_CHANNEL_STATE_CLOSED 0
#define IPC_CHANNEL_STATE_OPEN 1
#define IPC_UART_MAX_CHANNEL 1
struct ipc_uart_channels {
uint16_t index;
uint16_t state;
int (*cb)(int chan, int request, int len, void *data);
};
int nble_open(void); int nble_open(void);
/** /**