diff options
Diffstat (limited to 'drivers/staging/silicom/bypasslib')
-rw-r--r-- | drivers/staging/silicom/bypasslib/bp_ioctl.h | 64 | ||||
-rw-r--r-- | drivers/staging/silicom/bypasslib/bplibk.h | 12 | ||||
-rw-r--r-- | drivers/staging/silicom/bypasslib/bypass.c | 89 |
3 files changed, 81 insertions, 84 deletions
diff --git a/drivers/staging/silicom/bypasslib/bp_ioctl.h b/drivers/staging/silicom/bypasslib/bp_ioctl.h index 040c6fa..2d1ef53 100644 --- a/drivers/staging/silicom/bypasslib/bp_ioctl.h +++ b/drivers/staging/silicom/bypasslib/bp_ioctl.h @@ -14,41 +14,41 @@ #ifndef BP_IOCTL_H #define BP_IOCTL_H -#define BP_CAP 0x01 //BIT_0 -#define BP_STATUS_CAP 0x02 //BIT_1 -#define BP_STATUS_CHANGE_CAP 0x04 //BIT_2 -#define SW_CTL_CAP 0x08 //BIT_3 -#define BP_DIS_CAP 0x10 //BIT_4 -#define BP_DIS_STATUS_CAP 0x20 //BIT_5 -#define STD_NIC_CAP 0x40 //BIT_6 -#define BP_PWOFF_ON_CAP 0x80 //BIT_7 -#define BP_PWOFF_OFF_CAP 0x0100 //BIT_8 -#define BP_PWOFF_CTL_CAP 0x0200 //BIT_9 -#define BP_PWUP_ON_CAP 0x0400 //BIT_10 -#define BP_PWUP_OFF_CAP 0x0800 //BIT_11 -#define BP_PWUP_CTL_CAP 0x1000 //BIT_12 -#define WD_CTL_CAP 0x2000 //BIT_13 -#define WD_STATUS_CAP 0x4000 //BIT_14 -#define WD_TIMEOUT_CAP 0x8000 //BIT_15 -#define TX_CTL_CAP 0x10000 //BIT_16 -#define TX_STATUS_CAP 0x20000 //BIT_17 -#define TAP_CAP 0x40000 //BIT_18 -#define TAP_STATUS_CAP 0x80000 //BIT_19 -#define TAP_STATUS_CHANGE_CAP 0x100000 //BIT_20 -#define TAP_DIS_CAP 0x200000 //BIT_21 -#define TAP_DIS_STATUS_CAP 0x400000 //BIT_22 -#define TAP_PWUP_ON_CAP 0x800000 //BIT_23 -#define TAP_PWUP_OFF_CAP 0x1000000 //BIT 24 -#define TAP_PWUP_CTL_CAP 0x2000000 //BIT 25 -#define NIC_CAP_NEG 0x4000000 //BIT 26 -#define TPL_CAP 0x8000000 //BIT 27 -#define DISC_CAP 0x10000000 //BIT 28 -#define DISC_DIS_CAP 0x20000000 //BIT 29 -#define DISC_PWUP_CTL_CAP 0x40000000 //BIT 30 +#define BP_CAP 0x01 /* BIT_0 */ +#define BP_STATUS_CAP 0x02 /* BIT_1 */ +#define BP_STATUS_CHANGE_CAP 0x04 /* BIT_2 */ +#define SW_CTL_CAP 0x08 /* BIT_3 */ +#define BP_DIS_CAP 0x10 /* BIT_4 */ +#define BP_DIS_STATUS_CAP 0x20 /* BIT_5 */ +#define STD_NIC_CAP 0x40 /* BIT_6 */ +#define BP_PWOFF_ON_CAP 0x80 /* BIT_7 */ +#define BP_PWOFF_OFF_CAP 0x0100 /* BIT_8 */ +#define BP_PWOFF_CTL_CAP 0x0200 /* BIT_9 */ +#define BP_PWUP_ON_CAP 0x0400 /* BIT_10 */ +#define BP_PWUP_OFF_CAP 0x0800 /* BIT_11 */ +#define BP_PWUP_CTL_CAP 0x1000 /* BIT_12 */ +#define WD_CTL_CAP 0x2000 /* BIT_13 */ +#define WD_STATUS_CAP 0x4000 /* BIT_14 */ +#define WD_TIMEOUT_CAP 0x8000 /* BIT_15 */ +#define TX_CTL_CAP 0x10000 /* BIT_16 */ +#define TX_STATUS_CAP 0x20000 /* BIT_17 */ +#define TAP_CAP 0x40000 /* BIT_18 */ +#define TAP_STATUS_CAP 0x80000 /* BIT_19 */ +#define TAP_STATUS_CHANGE_CAP 0x100000 /* BIT_20 */ +#define TAP_DIS_CAP 0x200000 /* BIT_21 */ +#define TAP_DIS_STATUS_CAP 0x400000 /* BIT_22 */ +#define TAP_PWUP_ON_CAP 0x800000 /* BIT_23 */ +#define TAP_PWUP_OFF_CAP 0x1000000 /* BIT 24 */ +#define TAP_PWUP_CTL_CAP 0x2000000 /* BIT 25 */ +#define NIC_CAP_NEG 0x4000000 /* BIT 26 */ +#define TPL_CAP 0x8000000 /* BIT 27 */ +#define DISC_CAP 0x10000000 /* BIT 28 */ +#define DISC_DIS_CAP 0x20000000 /* BIT 29 */ +#define DISC_PWUP_CTL_CAP 0x40000000 /* BIT 30 */ #define WD_MIN_TIME_MASK(val) (val & 0xf) #define WD_STEP_COUNT_MASK(val) ((val & 0xf) << 5) -#define WDT_STEP_TIME 0x10 //BIT_4 +#define WDT_STEP_TIME 0x10 /* BIT_4 */ #define WD_MIN_TIME_GET(desc) (desc & 0xf) #define WD_STEP_COUNT_GET(desc) (desc>>5) & 0xf diff --git a/drivers/staging/silicom/bypasslib/bplibk.h b/drivers/staging/silicom/bypasslib/bplibk.h index d8c1d27..c5c75c4 100644 --- a/drivers/staging/silicom/bypasslib/bplibk.h +++ b/drivers/staging/silicom/bypasslib/bplibk.h @@ -24,15 +24,13 @@ #define INTEL_PEG4BPFII_PID 0x10a1 #define PEGII_IF_SERIES(vid, pid) \ - ((vid==0x8086)&& \ - ((pid==INTEL_PEG4BPII_PID)|| \ - (pid==INTEL_PEG4BPFII_PID))) - -#define EXPORT_SYMBOL_NOVERS EXPORT_SYMBOL + ((vid == 0x8086) && \ + ((pid == INTEL_PEG4BPII_PID) || \ + (pid == INTEL_PEG4BPFII_PID))) #ifdef BP_VENDOR_SUPPORT -char *bp_desc_array[] = - { "e1000bp", "e1000bpe", "slcm5700", "bnx2xbp", "ixgbp", "ixgbpe", NULL }; +char *bp_desc_array[] = { "e1000bp", "e1000bpe", "slcm5700", + "bnx2xbp", "ixgbp", "ixgbpe", NULL }; #endif #endif diff --git a/drivers/staging/silicom/bypasslib/bypass.c b/drivers/staging/silicom/bypasslib/bypass.c index 9ed2508..ba0d23a 100644 --- a/drivers/staging/silicom/bypasslib/bypass.c +++ b/drivers/staging/silicom/bypasslib/bypass.c @@ -188,69 +188,82 @@ static int is_bypass(int if_index) return is_bypass_dev(if_index); return ret; } +EXPORT_SYMBOL(is_bypass); static int get_bypass_slave(int if_index) { DO_BPLIB_GET_ARG_FN(get_bypass_slave, GET_BYPASS_SLAVE, if_index); } +EXPORT_SYMBOL(get_bypass_slave); static int get_bypass_caps(int if_index) { DO_BPLIB_GET_ARG_FN(get_bypass_caps, GET_BYPASS_CAPS, if_index); } +EXPORT_SYMBOL(get_bypass_caps); static int get_wd_set_caps(int if_index) { DO_BPLIB_GET_ARG_FN(get_wd_set_caps, GET_WD_SET_CAPS, if_index); } +EXPORT_SYMBOL(get_wd_set_caps); static int set_bypass(int if_index, int bypass_mode) { DO_BPLIB_SET_ARG_FN(set_bypass, SET_BYPASS, if_index, bypass_mode); } +EXPORT_SYMBOL(set_bypass); static int get_bypass(int if_index) { DO_BPLIB_GET_ARG_FN(get_bypass, GET_BYPASS, if_index); } +EXPORT_SYMBOL(get_bypass); static int get_bypass_change(int if_index) { DO_BPLIB_GET_ARG_FN(get_bypass_change, GET_BYPASS_CHANGE, if_index); } +EXPORT_SYMBOL(get_bypass_change); static int set_dis_bypass(int if_index, int dis_bypass) { DO_BPLIB_SET_ARG_FN(set_dis_bypass, SET_DIS_BYPASS, if_index, dis_bypass); } +EXPORT_SYMBOL(set_dis_bypass); static int get_dis_bypass(int if_index) { DO_BPLIB_GET_ARG_FN(get_dis_bypass, GET_DIS_BYPASS, if_index); } +EXPORT_SYMBOL(get_dis_bypass); static int set_bypass_pwoff(int if_index, int bypass_mode) { DO_BPLIB_SET_ARG_FN(set_bypass_pwoff, SET_BYPASS_PWOFF, if_index, bypass_mode); } +EXPORT_SYMBOL(set_bypass_pwoff); static int get_bypass_pwoff(int if_index) { DO_BPLIB_GET_ARG_FN(get_bypass_pwoff, GET_BYPASS_PWOFF, if_index); } +EXPORT_SYMBOL(get_bypass_pwoff); static int set_bypass_pwup(int if_index, int bypass_mode) { DO_BPLIB_SET_ARG_FN(set_bypass_pwup, SET_BYPASS_PWUP, if_index, bypass_mode); } +EXPORT_SYMBOL(set_bypass_pwup); static int get_bypass_pwup(int if_index) { DO_BPLIB_GET_ARG_FN(get_bypass_pwup, GET_BYPASS_PWUP, if_index); } +EXPORT_SYMBOL(get_bypass_pwup); static int set_bypass_wd(int if_index, int ms_timeout, int *ms_timeout_set) { @@ -267,6 +280,7 @@ static int set_bypass_wd(int if_index, int ms_timeout, int *ms_timeout_set) } return ret; } +EXPORT_SYMBOL(set_bypass_wd); static int get_bypass_wd(int if_index, int *ms_timeout_set) { @@ -278,6 +292,7 @@ static int get_bypass_wd(int if_index, int *ms_timeout_set) ret = doit(GET_BYPASS_WD, if_index, data); return ret; } +EXPORT_SYMBOL(get_bypass_wd); static int get_wd_expire_time(int if_index, int *ms_time_left) { @@ -292,143 +307,171 @@ static int get_wd_expire_time(int if_index, int *ms_time_left) } return ret; } +EXPORT_SYMBOL(get_wd_expire_time); static int reset_bypass_wd_timer(int if_index) { DO_BPLIB_GET_ARG_FN(reset_bypass_wd_timer, RESET_BYPASS_WD_TIMER, if_index); } +EXPORT_SYMBOL(reset_bypass_wd_timer); static int set_std_nic(int if_index, int bypass_mode) { DO_BPLIB_SET_ARG_FN(set_std_nic, SET_STD_NIC, if_index, bypass_mode); } +EXPORT_SYMBOL(set_std_nic); static int get_std_nic(int if_index) { DO_BPLIB_GET_ARG_FN(get_std_nic, GET_STD_NIC, if_index); } +EXPORT_SYMBOL(get_std_nic); static int set_tx(int if_index, int tx_state) { DO_BPLIB_SET_ARG_FN(set_tx, SET_TX, if_index, tx_state); } +EXPORT_SYMBOL(set_tx); static int get_tx(int if_index) { DO_BPLIB_GET_ARG_FN(get_tx, GET_TX, if_index); } +EXPORT_SYMBOL(get_tx); static int set_tap(int if_index, int tap_mode) { DO_BPLIB_SET_ARG_FN(set_tap, SET_TAP, if_index, tap_mode); } +EXPORT_SYMBOL(set_tap); static int get_tap(int if_index) { DO_BPLIB_GET_ARG_FN(get_tap, GET_TAP, if_index); } +EXPORT_SYMBOL(get_tap); static int get_tap_change(int if_index) { DO_BPLIB_GET_ARG_FN(get_tap_change, GET_TAP_CHANGE, if_index); } +EXPORT_SYMBOL(get_tap_change); static int set_dis_tap(int if_index, int dis_tap) { DO_BPLIB_SET_ARG_FN(set_dis_tap, SET_DIS_TAP, if_index, dis_tap); } +EXPORT_SYMBOL(set_dis_tap); static int get_dis_tap(int if_index) { DO_BPLIB_GET_ARG_FN(get_dis_tap, GET_DIS_TAP, if_index); } +EXPORT_SYMBOL(get_dis_tap); static int set_tap_pwup(int if_index, int tap_mode) { DO_BPLIB_SET_ARG_FN(set_tap_pwup, SET_TAP_PWUP, if_index, tap_mode); } +EXPORT_SYMBOL(set_tap_pwup); static int get_tap_pwup(int if_index) { DO_BPLIB_GET_ARG_FN(get_tap_pwup, GET_TAP_PWUP, if_index); } +EXPORT_SYMBOL(get_tap_pwup); static int set_bp_disc(int if_index, int disc_mode) { DO_BPLIB_SET_ARG_FN(set_bp_disc, SET_DISC, if_index, disc_mode); } +EXPORT_SYMBOL(set_bp_disc); static int get_bp_disc(int if_index) { DO_BPLIB_GET_ARG_FN(get_bp_disc, GET_DISC, if_index); } +EXPORT_SYMBOL(get_bp_disc); static int get_bp_disc_change(int if_index) { DO_BPLIB_GET_ARG_FN(get_bp_disc_change, GET_DISC_CHANGE, if_index); } +EXPORT_SYMBOL(get_bp_disc_change); static int set_bp_dis_disc(int if_index, int dis_disc) { DO_BPLIB_SET_ARG_FN(set_bp_dis_disc, SET_DIS_DISC, if_index, dis_disc); } +EXPORT_SYMBOL(set_bp_dis_disc); static int get_bp_dis_disc(int if_index) { DO_BPLIB_GET_ARG_FN(get_bp_dis_disc, GET_DIS_DISC, if_index); } +EXPORT_SYMBOL(get_bp_dis_disc); static int set_bp_disc_pwup(int if_index, int disc_mode) { DO_BPLIB_SET_ARG_FN(set_bp_disc_pwup, SET_DISC_PWUP, if_index, disc_mode); } +EXPORT_SYMBOL(set_bp_disc_pwup); static int get_bp_disc_pwup(int if_index) { DO_BPLIB_GET_ARG_FN(get_bp_disc_pwup, GET_DISC_PWUP, if_index); } +EXPORT_SYMBOL(get_bp_disc_pwup); static int set_wd_exp_mode(int if_index, int mode) { DO_BPLIB_SET_ARG_FN(set_wd_exp_mode, SET_WD_EXP_MODE, if_index, mode); } +EXPORT_SYMBOL(set_wd_exp_mode); static int get_wd_exp_mode(int if_index) { DO_BPLIB_GET_ARG_FN(get_wd_exp_mode, GET_WD_EXP_MODE, if_index); } +EXPORT_SYMBOL(get_wd_exp_mode); static int set_wd_autoreset(int if_index, int time) { DO_BPLIB_SET_ARG_FN(set_wd_autoreset, SET_WD_AUTORESET, if_index, time); } +EXPORT_SYMBOL(set_wd_autoreset); static int get_wd_autoreset(int if_index) { DO_BPLIB_GET_ARG_FN(get_wd_autoreset, GET_WD_AUTORESET, if_index); } +EXPORT_SYMBOL(get_wd_autoreset); static int set_tpl(int if_index, int tpl_mode) { DO_BPLIB_SET_ARG_FN(set_tpl, SET_TPL, if_index, tpl_mode); } +EXPORT_SYMBOL(set_tpl); static int get_tpl(int if_index) { DO_BPLIB_GET_ARG_FN(get_tpl, GET_TPL, if_index); } +EXPORT_SYMBOL(get_tpl); static int set_bp_hw_reset(int if_index, int mode) { DO_BPLIB_SET_ARG_FN(set_tpl, SET_BP_HW_RESET, if_index, mode); } +EXPORT_SYMBOL(set_bp_hw_reset); static int get_bp_hw_reset(int if_index) { DO_BPLIB_GET_ARG_FN(get_tpl, GET_BP_HW_RESET, if_index); } +EXPORT_SYMBOL(get_bp_hw_reset); static int get_bypass_info(int if_index, struct bp_info *bp_info) { @@ -467,6 +510,7 @@ static int get_bypass_info(int if_index, struct bp_info *bp_info) } return ret; } +EXPORT_SYMBOL(get_bypass_info); int init_lib_module(void) { @@ -479,50 +523,5 @@ void cleanup_lib_module(void) { } -EXPORT_SYMBOL_NOVERS(is_bypass); -EXPORT_SYMBOL_NOVERS(get_bypass_slave); -EXPORT_SYMBOL_NOVERS(get_bypass_caps); -EXPORT_SYMBOL_NOVERS(get_wd_set_caps); -EXPORT_SYMBOL_NOVERS(set_bypass); -EXPORT_SYMBOL_NOVERS(get_bypass); -EXPORT_SYMBOL_NOVERS(get_bypass_change); -EXPORT_SYMBOL_NOVERS(set_dis_bypass); -EXPORT_SYMBOL_NOVERS(get_dis_bypass); -EXPORT_SYMBOL_NOVERS(set_bypass_pwoff); -EXPORT_SYMBOL_NOVERS(get_bypass_pwoff); -EXPORT_SYMBOL_NOVERS(set_bypass_pwup); -EXPORT_SYMBOL_NOVERS(get_bypass_pwup); -EXPORT_SYMBOL_NOVERS(set_bypass_wd); -EXPORT_SYMBOL_NOVERS(get_bypass_wd); -EXPORT_SYMBOL_NOVERS(get_wd_expire_time); -EXPORT_SYMBOL_NOVERS(reset_bypass_wd_timer); -EXPORT_SYMBOL_NOVERS(set_std_nic); -EXPORT_SYMBOL_NOVERS(get_std_nic); -EXPORT_SYMBOL_NOVERS(set_tx); -EXPORT_SYMBOL_NOVERS(get_tx); -EXPORT_SYMBOL_NOVERS(set_tap); -EXPORT_SYMBOL_NOVERS(get_tap); -EXPORT_SYMBOL_NOVERS(get_tap_change); -EXPORT_SYMBOL_NOVERS(set_dis_tap); -EXPORT_SYMBOL_NOVERS(get_dis_tap); -EXPORT_SYMBOL_NOVERS(set_tap_pwup); -EXPORT_SYMBOL_NOVERS(get_tap_pwup); -EXPORT_SYMBOL_NOVERS(set_bp_disc); -EXPORT_SYMBOL_NOVERS(get_bp_disc); -EXPORT_SYMBOL_NOVERS(get_bp_disc_change); -EXPORT_SYMBOL_NOVERS(set_bp_dis_disc); -EXPORT_SYMBOL_NOVERS(get_bp_dis_disc); -EXPORT_SYMBOL_NOVERS(set_bp_disc_pwup); -EXPORT_SYMBOL_NOVERS(get_bp_disc_pwup); -EXPORT_SYMBOL_NOVERS(set_wd_exp_mode); -EXPORT_SYMBOL_NOVERS(get_wd_exp_mode); -EXPORT_SYMBOL_NOVERS(set_wd_autoreset); -EXPORT_SYMBOL_NOVERS(get_wd_autoreset); -EXPORT_SYMBOL_NOVERS(set_tpl); -EXPORT_SYMBOL_NOVERS(get_tpl); -EXPORT_SYMBOL_NOVERS(set_bp_hw_reset); -EXPORT_SYMBOL_NOVERS(get_bp_hw_reset); -EXPORT_SYMBOL_NOVERS(get_bypass_info); - module_init(init_lib_module); module_exit(cleanup_lib_module); |