drivers/net/skfp/: cleanups
Subsystems (2)
PATCH 1/1 drivers/net/skfp/: cleanups
This patch contains the following cleanups:
- make needlessly global code static
- remove the completely unused smtparse.c
- remove the following unused global functions:
- drvfbi.c: init_dma
- drvfbi.c: dis_dma
- drvfbi.c: get_rom_byte
- drvfbi.c: mac_drv_vpd_read
- drvfbi.c: mac_drv_pci_fix
- fplustm.c: mac_set_func_addr
- fplustm.c: mac_del_multicast
- hwmtm.c: mac_drv_rx_frag
- pcmplc.c: pcm_set_lct_short
- smt.c: smt_please_reconnect
- smt.c: smt_change_t_neg
- smtdef.c: smt_set_defaults
Signed-off-by Adrian Bunk <[email protected]>
---
This patch was already sent on:
- 19 Feb 2005
drivers/net/skfp/Makefile | 2 drivers/net/skfp/drvfbi.c | 222 ----------------- drivers/net/skfp/ess.c | 4 drivers/net/skfp/fplustm.c | 70 ----- drivers/net/skfp/h/cmtdef.h | 7 drivers/net/skfp/h/hwmtm.h | 25 - drivers/net/skfp/hwmtm.c | 34 -- drivers/net/skfp/pcmplc.c | 7 drivers/net/skfp/pmf.c | 11 drivers/net/skfp/skfddi.c | 1 drivers/net/skfp/smt.c | 46 --- drivers/net/skfp/smtdef.c | 5 drivers/net/skfp/smtparse.c | 467 ------------------------------------ 13 files changed, 19 insertions(+), 882 deletions(-)
drivers/net/skfp/smtparse.c deleted +0 -467
@@ -1,467 +0,0 @@ -/****************************************************************************** -* -* (C)Copyright 1998,1999 SysKonnect, -* a business unit of Schneider & Koch & Co. Datensysteme GmbH. -* -* See the file "skfddi.c" for further information. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* The information in this file is provided "AS IS" without warranty. -* -******************************************************************************/ - - -/* -parser for SMT parameters -*/ - -#include "h/types.h" -#include "h/fddi.h" -#include "h/smc.h" -#include "h/smt_p.h" - -#define KERNEL -#include "h/smtstate.h" - -#ifndef lint -static const char ID_sccs[] ="@(#)smtparse.c 1.12 98/10/06 (C) SK " ; -#endif - -#ifdef sun -#define _far -#endif - -/* -* convert to BCLK units -*/ -#define MS2BCLK (x) ((x)*12500L) -#define US2BCLK (x) ((x/10)*125L) - -/* -* parameter table -*/ -static struct s_ptab { -char *pt_name ; -u_short pt_num ; -u_short pt_type ; -u_long pt_min ; -u_long pt_max ; -} ptab[] = { - {"PMFPASSWD" ,0 ,0 } , - {"USERDATA" ,1 ,0 } , - {"LERCUTOFFA" ,2 ,1 ,4 ,15 } , - {"LERCUTOFFB" ,3 ,1 ,4 ,15 } , - {"LERALARMA" ,4 ,1 ,4 ,15 } , - {"LERALARMB" ,5 ,1 ,4 ,15 } , - {"TMAX" ,6 ,1 ,5 ,165 } , - {"TMIN" ,7 ,1 ,5 ,165 } , - {"TREQ" ,8 ,1 ,5 ,165 } , - {"TVX" ,9 ,1 ,2500 ,10000 } , -#ifdef ESS - {"SBAPAYLOAD" ,10 ,1 ,0 ,1562 } , - {"SBAOVERHEAD" ,11 ,1 ,50 ,5000 } , - {"MAXTNEG" ,12 ,1 ,5 ,165 } , - {"MINSEGMENTSIZE" ,13 ,1 ,0 ,4478 } , - {"SBACATEGORY" ,14 ,1 ,0 ,0xffff } , - {"SYNCHTXMODE" ,15 ,0 } , -#endif -#ifdef SBA - {"SBACOMMAND" ,16 ,0 } , - {"SBAAVAILABLE" ,17 ,1 ,0 ,100 } , -#endif - {NULL } -} ; - -/* Define maximum string size for values and keybuffer */ -#define MAX_VAL 40 - -/* -* local function declarations -*/ -static u_long parse_num(int type, char _far *value, char *v, u_long mn, -u_long mx,int scale); -static int parse_word(char *buf, char _far *text); - -#ifdef SIM -#define DB_MAIN (a,b,c) printf(a,b,c) -#else -#define DB_MAIN (a,b,c) -#endif - -/* -* BEGIN_MANUAL_ENTRY() -* -* int smt_parse_arg(struct s_smc *,char _far *keyword,int type, -char _far *value) -* -* parse SMT parameter -* *keyword -* pointer to keyword, must be \0, \n or \r terminated -* *value pointer to value, either char * or u_long * -* if char * -* pointer to value, must be \0, \n or \r terminated -* if u_long * -* contains binary value -* -* type 0: integer -* 1: string -* return -* 0 parameter parsed ok -* != 0 error -* NOTE: -* function can be called with DS != SS -* -* -* END_MANUAL_ENTRY() -*/ -int smt_parse_arg(struct s_smc *smc, char _far *keyword, int type, - char _far *value) -{ -char keybuf[MAX_VAL +1 ]; -char valbuf[MAX_VAL +1 ]; -char c ; -char *p ; -char *v ; -char *d ; -u_long val =0 ; -struct s_ptab *pt ; -int st ; -int i ; - -/* -* parse keyword -*/ -if ((st =parse_word (keybuf,keyword))) -return (st) ; -/* -* parse value if given as string -*/ -if (type ==1 ) { -if ((st =parse_word (valbuf,value))) -return (st) ; - } -/* -* search in table -*/ - st =0 ; -for (pt = ptab ; (v = pt->pt_name) ; pt++) { -for (p = keybuf ; (c = *p) ; p++,v++) { -if (c != *v) -break ; - } -if (!c && !*v) -break ; - } -if (!v) -return (-1 ) ; -#if 0 -printf ("=>%s<==>%s<=\n" ,pt->pt_name,valbuf) ; -#endif -/* -* set value in MIB -*/ -if (pt->pt_type) - val =parse_num (type,value,valbuf,pt->pt_min,pt->pt_max,1 ) ; -switch (pt->pt_num) { -case 0 : - v = valbuf ; - d = (char *) smc->mib.fddiPRPMFPasswd ; -for (i =0 ; i < (signed )sizeof (smc->mib.fddiPRPMFPasswd) ; i++) - *d++ = *v++ ; -DB_MAIN ("SET %s = %s\n" ,pt->pt_name,smc->mib.fddiPRPMFPasswd) ; -break ; -case 1 : - v = valbuf ; - d = (char *) smc->mib.fddiSMTUserData ; -for (i =0 ; i < (signed )sizeof (smc->mib.fddiSMTUserData) ; i++) - *d++ = *v++ ; -DB_MAIN ("SET %s = %s\n" ,pt->pt_name,smc->mib.fddiSMTUserData) ; -break ; -case 2 : - smc->mib.p[PA ].fddiPORTLer_Cutoff = (u_char ) val ; -DB_MAIN ("SET %s = %d\n" , - pt->pt_name,smc->mib.p[PA ].fddiPORTLer_Cutoff) ; -break ; -case 3 : - smc->mib.p[PB ].fddiPORTLer_Cutoff = (u_char ) val ; -DB_MAIN ("SET %s = %d\n" , - pt->pt_name,smc->mib.p[PB ].fddiPORTLer_Cutoff) ; -break ; -case 4 : - smc->mib.p[PA ].fddiPORTLer_Alarm = (u_char ) val ; -DB_MAIN ("SET %s = %d\n" , - pt->pt_name,smc->mib.p[PA ].fddiPORTLer_Alarm) ; -break ; -case 5 : - smc->mib.p[PB ].fddiPORTLer_Alarm = (u_char ) val ; -DB_MAIN ("SET %s = %d\n" , - pt->pt_name,smc->mib.p[PB ].fddiPORTLer_Alarm) ; -break ; -case 6 :/* TMAX */ -DB_MAIN ("SET %s = %d\n" ,pt->pt_name,val) ; - smc->mib.a[PATH0 ].fddiPATHT_MaxLowerBound = - (u_long) -MS2BCLK ((long )val) ; -break ; -case 7 :/* TMIN */ -DB_MAIN ("SET %s = %d\n" ,pt->pt_name,val) ; - smc->mib.m[MAC0 ].fddiMACT_Min = - (u_long) -MS2BCLK ((long )val) ; -break ; -case 8 :/* TREQ */ -DB_MAIN ("SET %s = %d\n" ,pt->pt_name,val) ; - smc->mib.a[PATH0 ].fddiPATHMaxT_Req = - (u_long) -MS2BCLK ((long )val) ; -break ; -case 9 :/* TVX */ -DB_MAIN ("SET %s = %d \n" ,pt->pt_name,val) ; - smc->mib.a[PATH0 ].fddiPATHTVXLowerBound = - (u_long) -US2BCLK ((long )val) ; -break ; -#ifdef ESS -case 10 :/* SBAPAYLOAD */ -DB_MAIN ("SET %s = %d\n" ,pt->pt_name,val) ; -if (smc->mib.fddiESSPayload != val) { - smc->ess.raf_act_timer_poll = TRUE ; - smc->mib.fddiESSPayload = val ; - } -break ; -case 11 :/* SBAOVERHEAD */ -DB_MAIN ("SET %s = %d\n" ,pt->pt_name,val) ; - smc->mib.fddiESSOverhead = val ; -break ; -case 12 :/* MAXTNEG */ -DB_MAIN ("SET %s = %d\n" ,pt->pt_name,val) ; - smc->mib.fddiESSMaxTNeg = (u_long) -MS2BCLK ((long )val) ; -break ; -case 13 :/* MINSEGMENTSIZE */ -DB_MAIN ("SET %s = %d\n" ,pt->pt_name,val) ; - smc->mib.fddiESSMinSegmentSize = val ; -break ; -case 14 :/* SBACATEGORY */ -DB_MAIN ("SET %s = %d\n" ,pt->pt_name,val) ; - smc->mib.fddiESSCategory = - (smc->mib.fddiESSCategory &0xffff ) | - ((u_long)(val <<16 )) ; -break ; -case 15 :/* SYNCHTXMODE */ -/* do not use memcmp(valbuf,"ALL",3) because DS != SS */ -if (valbuf[0 ] =='A' && valbuf[1 ] =='L' && valbuf[2 ] =='L' ) { - smc->mib.fddiESSSynchTxMode = TRUE ; -DB_MAIN ("SET %s = %s\n" ,pt->pt_name,valbuf) ; - } -/* if (!memcmp(valbuf,"SPLIT",5)) { */ -if (valbuf[0 ] =='S' && valbuf[1 ] =='P' && valbuf[2 ] =='L' && - valbuf[3 ] =='I' && valbuf[4 ] =='T' ) { -DB_MAIN ("SET %s = %s\n" ,pt->pt_name,valbuf) ; - smc->mib.fddiESSSynchTxMode = FALSE ; - } -break ; -#endif -#ifdef SBA -case 16 :/* SBACOMMAND */ -/* if (!memcmp(valbuf,"START",5)) { */ -if (valbuf[0 ] =='S' && valbuf[1 ] =='T' && valbuf[2 ] =='A' && - valbuf[3 ] =='R' && valbuf[4 ] =='T' ) { -DB_MAIN ("SET %s = %s\n" ,pt->pt_name,valbuf) ; - smc->mib.fddiSBACommand =SB_START ; - } -/* if (!memcmp(valbuf,"STOP",4)) { */ -if (valbuf[0 ] =='S' && valbuf[1 ] =='T' && valbuf[2 ] =='O' && - valbuf[3 ] =='P' ) { -DB_MAIN ("SET %s = %s\n" ,pt->pt_name,valbuf) ; - smc->mib.fddiSBACommand =SB_STOP ; - } -break ; -case 17 :/* SBAAVAILABLE */ -DB_MAIN ("SET %s = %d\n" ,pt->pt_name,val) ; - smc->mib.fddiSBAAvailable = (u_char ) val ; -break ; -#endif - } -return (0 ) ; -} - -static int parse_word(char *buf, char _far *text) -{ -char c ; -char *p ; -int p_len ; -int quote ; -int i ; -int ok ; - -/* -* skip leading white space -*/ - p = buf ; -for (i =0 ; i <MAX_VAL ; i++) - *p++ =0 ; - p = buf ; - p_len =0 ; - ok =0 ; -while ( (c = *text++) && (c !='\n' ) && (c !='\r' )) { -if ((c !=' ' ) && (c !='\t' )) { - ok =1 ; -break ; - } - } -if (!ok) -return (-1 ) ; -if (c =='"' ) { - quote =1 ; - } -else { - quote =0 ; - text-- ; - } -/* -* parse valbuf -*/ - ok =0 ; -while (!ok && p_len <MAX_VAL -1 && (c = *text++) && (c !='\n' ) - && (c !='\r' )) { -switch (quote) { -case 0 : -if ((c ==' ' ) || (c =='\t' ) || (c =='=' )) { - ok =1 ; -break ; - } - *p++ = c ; - p_len++ ; -break ; -case 2 : - *p++ = c ; - p_len++ ; - quote =1 ; -break ; -case 1 : -switch (c) { -case '"' : - ok =1 ; -break ; -case '\\' : - quote =2 ; -break ; -default : - *p++ = c ; - p_len++ ; - } - } - } - *p++ =0 ; -for (p = buf ; (c = *p) ; p++) { -if (c >='a' && c <='z' ) - *p = c +'A' -'a' ; - } -return (0 ) ; -} - -static u_long parse_num(int type, char _far *value, char *v, u_long mn, -u_long mx,int scale) -{ -u_long x =0 ; -char c ; - -if (type ==0 ) {/* integer */ - u_long _far *l ; -u_long u1 ; - - l = (u_long _far *) value ; - u1 = *l ; -/* -* if the value is negative take the lower limit -*/ -if ((long )u1 <0 ) { -if (- ((long )u1) > (long ) mx) { - u1 =0 ; - } -else { - u1 = (u_long) - ((long )u1) ; - } - } - x = u1 ; - } -else {/* string */ -int sign =0 ; - -if (*v =='-' ) { - sign =1 ; - } -while ((c = *v++) && (c >='0' ) && (c <='9' )) { - x = x *10 + c -'0' ; - } -if (scale ==10 ) { - x *=10 ; -if (c =='.' ) { -if ((c = *v++) && (c >='0' ) && (c <='9' )) { - x += c -'0' ; - } - } - } -if (sign) - x = (u_long) - ((long )x) ; - } -/* -* if the value is negative -* and the absolute value is outside the limits -* take the lower limit -* else -* take the absoute value -*/ -if ((long )x <0 ) { -if (- ((long )x) > (long ) mx) { - x =0 ; - } -else { - x = (u_long) - ((long )x) ; - } - } -if (x < mn) -return (mn) ; -else if (x > mx) -return (mx) ; -return (x) ; -} - -#if 0 -struct s_smc SMC ; -main() -{ -char *p ; -char *v ; -char buf[100 ] ; -int toggle =0 ; - -while (gets (buf)) { - p = buf ; -while (*p && ((*p ==' ' ) || (*p =='\t' ))) - p++ ; - -while (*p && ((*p !=' ' ) && (*p !='\t' ))) - p++ ; - - v = p ; -while (*v && ((*v ==' ' ) || (*v =='\t' ))) - v++ ; -if ((*v >='0' ) && (*v <='9' )) { - toggle = !toggle ; -if (toggle) { -u_long l ; - l =atol (v) ; - smt_parse_arg(&SMC,buf,0,(char _far *)&l) ; - } -else - smt_parse_arg(&SMC,buf,1,(char _far *)p) ; - } -else { - smt_parse_arg(&SMC,buf,1,(char _far *)p) ; - } - } -exit (0 ) ; -} -#endif -
drivers/net/skfp/h/cmtdef.h renamed from drivers/net/skfp/h/cmtdef.h.old +0 -7
@@ -507,7 +507,6 @@ int *remote, int *mac);void plc_config_mux (struct s_smc *smc,int mux);void sm_lem_evaluate (struct s_smc *smc); -void smt_clear_una_dna (struct s_smc *smc);void mac_update_counter (struct s_smc *smc);void sm_pm_ls_latch (struct s_smc *smc,int phy,int on_off);void sm_ma_control (struct s_smc *smc,int mode);
@@ -541,11 +540,9 @@u_long smt_get_time (void );u_long smt_get_tid (struct s_smc *smc);void smt_timer_done (struct s_smc *smc); -void smt_set_defaults (struct s_smc *smc);void smt_fixup_mib (struct s_smc *smc);void smt_reset_defaults (struct s_smc *smc,int level);void smt_agent_task (struct s_smc *smc); -void smt_please_reconnect (struct s_smc *smc,int reconn_time);int smt_check_para (struct s_smc *smc,struct smt_header *sm,const u_short list[]);void driver_get_bia (struct s_smc *smc,struct fddi_addr *bia_addr);
@@ -568,7 +565,6 @@int pcm_rooted_station (struct s_smc *smc);int cfm_get_mac_input (struct s_smc *smc);int cfm_get_mac_output (struct s_smc *smc); -int port_to_mib (struct s_smc *smc,int p);int cem_build_path (struct s_smc *smc,char *to,int path_index);int sm_mac_get_tx_state (struct s_smc *smc);char *get_pcmstate (struct s_smc *smc,int np);
@@ -580,8 +576,6 @@void smt_set_timestamp (struct s_smc *smc,u_char *p);void mac_set_rx_mode (struct s_smc *smc,int mode);int mac_add_multicast (struct s_smc *smc,struct fddi_addr *addr,int can); -int mac_set_func_addr (struct s_smc *smc,u_long f_addr); -void mac_del_multicast (struct s_smc *smc,struct fddi_addr *addr,int can);void mac_update_multicast (struct s_smc *smc);void mac_clear_multicast (struct s_smc *smc);void set_formac_tsync (struct s_smc *smc,long sync_bw);
@@ -599,7 +593,6 @@int smt_set_mac_opvalues (struct s_smc *smc);#ifdef TAG_MODE -void mac_drv_pci_fix (struct s_smc *smc,u_long fix_value);void mac_do_pci_fix (struct s_smc *smc);void mac_drv_clear_tx_queue (struct s_smc *smc);void mac_drv_repair_descr (struct s_smc *smc);
drivers/net/skfp/drvfbi.c renamed from drivers/net/skfp/drvfbi.c.old +4 -218
252 lines not on this page · raw message
drivers/net/skfp/ess.c renamed from drivers/net/skfp/ess.c.old +2 -2
@@ -102,7 +102,7 @@void ess_para_change (struct s_smc *smc);int ess_raf_received_pack (struct s_smc *smc,SMbuf *mb,struct smt_header *sm,int fs); -int process_bw_alloc (struct s_smc *smc,long int payload,long int overhead); +static int process_bw_alloc (struct s_smc *smc,long int payload,long int overhead);/*
@@ -375,7 +375,7 @@* determines the synchronous bandwidth, set the TSYNC register and the * mib variables SBAPayload, SBAOverhead and fddiMACT-NEG. */ -int process_bw_alloc (struct s_smc *smc,long int payload,long int overhead) +static int process_bw_alloc (struct s_smc *smc,long int payload,long int overhead) {/* * determine the synchronous bandwidth (sync_bw) in bytes per T-NEG,
drivers/net/skfp/fplustm.c renamed from drivers/net/skfp/fplustm.c.old +0 -70
82 lines not on this page · raw message
drivers/net/skfp/skfddi.c renamed from drivers/net/skfp/skfddi.c.old +0 -1
@@ -149,7 +149,6 @@extern void mac_drv_rx_mode (struct s_smc *smc,int mode);extern void mac_drv_clear_rx_queue (struct s_smc *smc);extern void enable_tx_irq (struct s_smc *smc,u_short queue); -extern void mac_drv_clear_txd (struct s_smc *smc);static struct pci_device_id skfddi_pci_tbl[] = { {PCI_VENDOR_ID_SK ,PCI_DEVICE_ID_SK_FP ,PCI_ANY_ID ,PCI_ANY_ID , },
drivers/net/skfp/h/hwmtm.h renamed from drivers/net/skfp/h/hwmtm.h.old +0 -25
@@ -262,31 +262,6 @@ (smc)->hw.fp.tx_q[queue].tx_curr_put/* -* BEGIN_MANUAL_ENTRY(HWM_TX_CHECK) -* void HWM_TX_CHECK(smc,frame_status,low_water) -* -* function MACRO (hardware module, hwmtm.h) -* This macro is invoked by the OS-specific before it left it's -* driver_send function. This macro calls mac_drv_clear_txd -* if the free TxDs of the current transmit queue is equal or -* lower than the given low water mark. -* -* para frame_status status of the frame, see design description -* low_water low water mark of free TxD's -* -* END_MANUAL_ENTRY - */ -#ifndef HWM_NO_FLOW_CTL -#define HWM_TX_CHECK (smc,frame_status,low_water) {\ - if ((low_water)>=(smc)->hw.fp.tx_q[(frame_status)&QUEUE_A0].tx_free) {\ - mac_drv_clear_txd(smc) ;\ - }\ -} -#else -#define HWM_TX_CHECK (smc,frame_status,low_water) mac_drv_clear_txd(smc) -#endif - -/* * BEGIN_MANUAL_ENTRY(HWM_GET_RX_FRAG_LEN) * int HWM_GET_RX_FRAG_LEN(rxd) *
drivers/net/skfp/hwmtm.c renamed from drivers/net/skfp/hwmtm.c.old +2 -32
@@ -86,6 +86,7 @@static u_long repair_rxd_ring (struct s_smc *smc,struct s_smt_rx_queue *queue);static SMbuf *get_llc_rx (struct s_smc *smc);static SMbuf *get_txd_mb (struct s_smc *smc); +static void mac_drv_clear_txd (struct s_smc *smc);/* -------------------------------------------------------------
@@ -146,7 +147,6 @@*/ void process_receive (struct s_smc *smc);void fddi_isr (struct s_smc *smc); -void mac_drv_clear_txd (struct s_smc *smc);void smt_free_mbuf (struct s_smc *smc,SMbuf *mb);void init_driver_fplus (struct s_smc *smc);void mac_drv_rx_mode (struct s_smc *smc,int mode);
@@ -158,7 +158,6 @@ void hwm_rx_frag(struct s_smc *smc, char far *virt, u_long phys, int len,int frame_status); -int mac_drv_rx_frag(struct s_smc *smc, void far *virt, int len);int mac_drv_init (struct s_smc *smc);int hwm_tx_init (struct s_smc *smc,u_char fc,int frag_count,int frame_len,int frame_status);
@@ -1448,35 +1447,6 @@NDD_TRACE ("RHfE" ,r,AIX_REVERSE (r->rxd_rbadr),0 ) ; } -#ifndef NDIS_OS2 -/* -* BEGIN_MANUAL_ENTRY(mac_drv_rx_frag) -* int mac_drv_rx_frag(smc,virt,len) -* -* function DOWNCALL (hwmtm.c) -* mac_drv_rx_frag fills the fragment with a part of the frame. -* -* para virt the virtual address of the fragment -* len the length in bytes of the fragment -* -* return 0: success code, no errors possible -* -* END_MANUAL_ENTRY -*/ -int mac_drv_rx_frag(struct s_smc *smc, void far *virt, int len) -{ -NDD_TRACE ("RHSB" ,virt,len,smc->os.hwm.r.mb_pos) ; - -DB_RX ("receive from queue: len/virt: = %d/%x" ,len,virt,4 ) ; - memcpy((char far *)virt,smc->os.hwm.r.mb_pos,len) ; - smc->os.hwm.r.mb_pos += len ; - -NDD_TRACE ("RHSE" ,smc->os.hwm.r.mb_pos,0 ,0 ) ; -return (0 ) ; -} -#endif - -/* * BEGINN_MANUAL_ENTRY(mac_drv_clear_rx_queue) *
@@ -1978,7 +1948,7 @@* * END_MANUAL_ENTRY */ -void mac_drv_clear_txd (struct s_smc *smc) +static void mac_drv_clear_txd (struct s_smc *smc) {struct s_smt_tx_queue *queue ;struct s_smt_fp_txd volatile *t1 ;
drivers/net/skfp/pcmplc.c renamed from drivers/net/skfp/pcmplc.c.old +0 -7
@@ -1861,13 +1861,6 @@#endif } -void pcm_set_lct_short (struct s_smc *smc,int n) -{ -if (n <=0 || n >1000 ) -return ; - smc->s.lct_short = n ; -} -#ifdef DEBUG /* * fill state struct
drivers/net/skfp/pmf.c renamed from drivers/net/skfp/pmf.c.old +6 -5
@@ -36,12 +36,13 @@static int smt_check_set_count (struct s_smc *smc,struct smt_header *sm);static const struct s_p_tab *smt_get_ptab (u_short para);static int smt_mib_phys (struct s_smc *smc); -int smt_set_para (struct s_smc *smc,struct smt_para *pa,int index,int local, -int set); +static int smt_set_para (struct s_smc *smc,struct smt_para *pa,int index, +int local,int set);void smt_add_para (struct s_smc *smc,struct s_pcon *pcon,u_short para,int index,int local);static SMbuf *smt_build_pmf_response (struct s_smc *smc,struct smt_header *req,int set,int local); +static int port_to_mib (struct s_smc *smc,int p);#define MOFFSS (e) ((int)&(((struct fddi_mib *)0)->e))#define MOFFSA (e) ((int) (((struct fddi_mib *)0)->e))
@@ -1078,8 +1079,8 @@/* * set parameter */ -int smt_set_para (struct s_smc *smc,struct smt_para *pa,int index,int local, -int set) +static int smt_set_para (struct s_smc *smc,struct smt_para *pa,int index, +int local,int set) {#define IFSET (x) if (set) (x)
@@ -1549,7 +1550,7 @@#endif } -int port_to_mib (struct s_smc *smc,int p) +static int port_to_mib (struct s_smc *smc,int p) {#ifdef CONCENTRATOR SK_UNUSED (smc) ;
drivers/net/skfp/smt.c renamed from drivers/net/skfp/smt.c.old +4 -42
79 lines not on this page · raw message
drivers/net/skfp/smtdef.c renamed from drivers/net/skfp/smtdef.c.old +0 -5
@@ -76,11 +76,6 @@static void smt_init_mib (struct s_smc *smc,int level);static int set_min_max (int maxflag,u_long mib,u_long limit,u_long *oper); -void smt_set_defaults (struct s_smc *smc) -{ -smt_reset_defaults (smc,0 ) ; -} -#define MS2BCLK (x) ((x)*12500L)#define US2BCLK (x) ((x)*1250L)
drivers/net/skfp/Makefile renamed from drivers/net/skfp/Makefile.old +1 -1
@@ -7,7 +7,7 @@ skfp-objs := skfddi.o hwmtm.o fplustm.o smt.o cfm.o \ ecm.o pcmplc.o pmf.o queue.o rmt.o \ smtdef.o smtinit.o smttimer.o srf.o lnkstat.o \ - smtparse.o hwt.o drvfbi.o ess.o + hwt.o drvfbi.o ess.o # NOTE: # Compiling this driver produces some warnings (and some more are