summaryrefslogtreecommitdiff
path: root/cleopatre/application/managerd/inc
diff options
context:
space:
mode:
authorlefranc2009-12-15 08:57:23 +0000
committerlefranc2009-12-15 08:57:23 +0000
commit2c7f1c9c3c1ef8ae050ebbbdcde1eeec5e3b4c51 (patch)
treefe2433634471d2da2cb9092911a0d538a12ca5bf /cleopatre/application/managerd/inc
parent6412b4005f25adfcc3877a8337ce059901be99d5 (diff)
cleo/appli/managerd: change input and output names
- change all 'input' refs to 'br' - change all 'output' refs to 'plc' due to possibility to also send to eth git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6547 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/application/managerd/inc')
-rw-r--r--cleopatre/application/managerd/inc/bridge.h12
-rw-r--r--cleopatre/application/managerd/inc/managerd.h18
2 files changed, 15 insertions, 15 deletions
diff --git a/cleopatre/application/managerd/inc/bridge.h b/cleopatre/application/managerd/inc/bridge.h
index 3b5400a522..f31fa7d7aa 100644
--- a/cleopatre/application/managerd/inc/bridge.h
+++ b/cleopatre/application/managerd/inc/bridge.h
@@ -24,8 +24,8 @@
#include "managerd.h"
/** Interfaces name */
-#define INPUT_IFNAME "br0"
-#define OUTPUT_IFNAME "plc0"
+#define BR_IFNAME "br0"
+#define PLC_IFNAME "plc0"
/** TODO: suppress it it will be on toolchain */
#define ETH_P_HPAV 0x88e1
@@ -52,7 +52,7 @@ enum bridge_status {
enum bridge_status bridge_processing(struct managerd_ctx *ctx, uint8_t *buffer, int *len, int max_len);
/**
- * Receive a frame from INPUT interface.
+ * Receive a frame from BR interface.
*
* \param ctx managerd context.
* \param buffer frame pointer.
@@ -62,17 +62,17 @@ enum bridge_status bridge_processing(struct managerd_ctx *ctx, uint8_t *buffer,
int bridge_receive(struct managerd_ctx *ctx, uint8_t *buffer, int len);
/**
- * Send a frame to OUTPUT interface.
+ * Send a frame to PLC interface.
*
* \param ctx managerd context.
* \param buffer frame pointer.
* \param len length to send.
* \return error code.
*/
-int bridge_send(struct managerd_ctx *ctx, uint8_t *buffer, int len);
+int bridge_send_to_plc(struct managerd_ctx *ctx, uint8_t *buffer, int len);
/**
- * Wait a reception on INPUT interface with a timeout.
+ * Wait a reception on BR interface with a timeout.
*
* \param ctx managerd context.
* \return error code.
diff --git a/cleopatre/application/managerd/inc/managerd.h b/cleopatre/application/managerd/inc/managerd.h
index 7e3b30ac8f..4509c23c15 100644
--- a/cleopatre/application/managerd/inc/managerd.h
+++ b/cleopatre/application/managerd/inc/managerd.h
@@ -32,16 +32,16 @@
/** Context structure */
struct managerd_ctx {
- int sock_input;
- int sock_output;
+ int sock_br;
+ int sock_plc;
int gpio_fd;
- struct sockaddr_ll input_sll;
- struct sockaddr_ll output_sll;
- socklen_t input_sll_sz;
- socklen_t output_sll_sz;
- struct ifreq input_ifr;
- struct ifreq output_ifr;
- uint8_t input_mac_addr[ETH_ALEN];
+ struct sockaddr_ll br_sll;
+ struct sockaddr_ll plc_sll;
+ socklen_t br_sll_sz;
+ socklen_t plc_sll_sz;
+ struct ifreq br_ifr;
+ struct ifreq plc_ifr;
+ uint8_t br_mac_addr[ETH_ALEN];
union gpio_info sc_gpio;
union gpio_info led_gpio;
int is_sc_available;