diff options
| author |   nanger <zhenyinan@huawei.com> | 2018-08-20 11:23:31 +0800 |
|---|---|---|
| committer | nanger <zhenyinan@huawei.com> | 2018-08-22 09:52:09 +0800 |
| commit | 2a0db471858d1143b12ace6a062d37ea509612f7 (patch) | |
| tree | edf6b440822445577f4673de8a1bb4b95b1507cf /src/framework/hal | |
| parent | 9d488c4706a20a12554b9050d9b3313f8f67789d (diff) | |
Feat: HAL decoupling with DPDK
Change-Id: I62c60117e63e75793c1348b6852eed6753915077
Signed-off-by: nanger <zhenyinan@huawei.com>
Diffstat (limited to 'src/framework/hal')
| -rw-r--r-- | src/framework/hal/hal.c | 6 | ||||
| -rw-r--r-- | src/framework/hal/hal.h | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/framework/hal/hal.c b/src/framework/hal/hal.c index 1adf274..545c759 100644 --- a/src/framework/hal/hal.c +++ b/src/framework/hal/hal.c @@ -31,8 +31,6 @@ static char* hal_invalid_str_script[] = {"&&", "||", ">>", "${", ";;", "/./", "/ static char* hal_invalid_str_script_begin[] = {"./", "../"}; -extern const netif_ops_t dpdk_netif_ops; - static hal_hdl_t hal_invaldi_hdl = {.id = -1}; static const netif_ops_t* netif_ops_table[HAL_DRV_MAX]; @@ -598,7 +596,7 @@ hal_get_capability (hal_hdl_t hdl, hal_netif_capa_t * info) *****************************************************************************/ uint16_t hal_recv_packet (hal_hdl_t hdl, uint16_t queue_id, - struct common_mem_mbuf **rx_pkts, uint16_t nb_pkts) + hal_mbuf_t ** rx_pkts, uint16_t nb_pkts) { netif_inst_t *inst; @@ -627,7 +625,7 @@ hal_recv_packet (hal_hdl_t hdl, uint16_t queue_id, *****************************************************************************/ uint16_t hal_send_packet (hal_hdl_t hdl, uint16_t queue_id, - struct common_mem_mbuf ** tx_pkts, uint16_t nb_pkts) + hal_mbuf_t ** tx_pkts, uint16_t nb_pkts) { netif_inst_t *inst; diff --git a/src/framework/hal/hal.h b/src/framework/hal/hal.h index 2f66914..36ad79d 100644 --- a/src/framework/hal/hal.h +++ b/src/framework/hal/hal.h @@ -59,7 +59,7 @@ typedef struct dpdk_if uint32_t rx_queue_num; uint32_t rx_ring_size[HAL_ETH_MAX_QUEUE_NUM]; - struct rte_mempool *rx_pool[HAL_ETH_MAX_QUEUE_NUM]; + hal_mempool_t *rx_pool[HAL_ETH_MAX_QUEUE_NUM]; uint32_t tx_queue_num; uint32_t tx_ring_size[HAL_ETH_MAX_QUEUE_NUM]; @@ -103,9 +103,9 @@ typedef struct netif_ops int (*macaddr) (netif_inst_t * inst, void *mac_addr); int (*capability) (netif_inst_t * inst, hal_netif_capa_t * info); uint16_t (*recv) (netif_inst_t * inst, uint16_t queue_id, - struct common_mem_mbuf ** rx_pkts, uint16_t nb_pkts); + hal_mbuf_t ** rx_pkts, uint16_t nb_pkts); uint16_t (*send) (netif_inst_t * inst, uint16_t queue_id, - struct common_mem_mbuf ** tx_pkts, uint16_t nb_pkts); + hal_mbuf_t ** tx_pkts, uint16_t nb_pkts); uint32_t (*link_status) (netif_inst_t * inst); int (*stats) (netif_inst_t * inst, hal_netif_stats_t * stats); int (*stats_reset) (netif_inst_t * inst); |