removed typedefs from ucc_geth driver
PATCH 14/15 removed typedefs from ucc_geth driver
removed typedefs from ucc_geth driver
Signed-off-by Kim Phillips <[email protected]>
--- drivers/net/ucc_geth.c | 348 ++++++++++++++++++++++--------------------- drivers/net/ucc_geth.h | 248 +++++++++++++++---------------- drivers/net/ucc_geth_phy.c | 12 + drivers/net/ucc_geth_phy.h | 2 include/linux/fsl_devices.h | 6 - 5 files changed, 307 insertions(+), 309 deletions(-)
drivers/net/ucc_geth.c +174 -174
@@ -67,7 +67,7 @@ #endif /* UGETH_VERBOSE_DEBUG */static DEFINE_SPINLOCK (ugeth_lock); -static ucc_geth_info_t ugeth_primary_info = { +static struct ucc_geth_info ugeth_primary_info = { .uf_info = { .bd_mem_part =MEM_PART_SYSTEM , .rtsm =UCC_FAST_SEND_IDLES_BETWEEN_FRAMES ,
@@ -160,7 +160,7 @@ #endif .riscRx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, }; -static ucc_geth_info_t ugeth_info[8 ]; +static struct ucc_geth_info ugeth_info[8 ];#ifdef DEBUG static void mem_disp (u8 *addr,int size)
@@ -216,8 +216,8 @@ static struct list_head *dequeue(struct } } -static int get_interface_details(enet_interface_e enet_interface, - enet_speed_e *speed, +static int get_interface_details(enum enet_interface enet_interface, + enum enet_speed *speed, int *r10m, int *rmm, int *rpm,
@@ -280,7 +280,7 @@ static int get_interface_details(enet_inreturn 0 ; } -static struct sk_buff *get_new_skb (ucc_geth_private_t *ugeth,u8 *bd) +static struct sk_buff *get_new_skb (struct ucc_geth_private *ugeth,u8 *bd) {struct sk_buff *skb =NULL ;
@@ -314,7 +314,7 @@ static struct sk_buff *get_new_skb(ucc_greturn skb; } -static int rx_bd_buffer_set (ucc_geth_private_t *ugeth,u8 rxQ) +static int rx_bd_buffer_set (struct ucc_geth_private *ugeth,u8 rxQ) {u8 *bd;u32 bd_status;
@@ -342,12 +342,12 @@ static int rx_bd_buffer_set(ucc_geth_prireturn 0 ; } -static int fill_init_enet_entries (ucc_geth_private_t *ugeth, +static int fill_init_enet_entries (struct ucc_geth_private *ugeth,volatile u32 *p_start,u8 num_entries,u32 thread_size,u32 thread_alignment, -qe_risc_allocation_e risc, +enum qe_risc_allocation risc,int skip_page_for_first_entry) {u32 init_enet_offset;
@@ -380,10 +380,10 @@ static int fill_init_enet_entries(ucc_gereturn 0 ; } -static int return_init_enet_entries (ucc_geth_private_t *ugeth, +static int return_init_enet_entries (struct ucc_geth_private *ugeth,volatile u32 *p_start,u8 num_entries, -qe_risc_allocation_e risc, +enum qe_risc_allocation risc,int skip_page_for_first_entry) {u32 init_enet_offset;
@@ -413,11 +413,11 @@ static int return_init_enet_entries(ucc_ }#ifdef DEBUG -static int dump_init_enet_entries (ucc_geth_private_t *ugeth, +static int dump_init_enet_entries (struct ucc_geth_private *ugeth,volatile u32 *p_start,u8 num_entries,u32 thread_size, -qe_risc_allocation_e risc, +enum qe_risc_allocation risc,int skip_page_for_first_entry) {u32 init_enet_offset;
@@ -453,14 +453,14 @@ static int dump_init_enet_entries(ucc_ge#endif #ifdef CONFIG_UGETH_FILTERING -static enet_addr_container_t *get_enet_addr_container (void ) +static struct enet_addr_container *get_enet_addr_container (void ) { -enet_addr_container_t *enet_addr_cont; +struct enet_addr_container *enet_addr_cont;/* allocate memory */ - enet_addr_cont =kmalloc (sizeof (enet_addr_container_t),GFP_KERNEL ); + enet_addr_cont =kmalloc (sizeof (struct enet_addr_container ),GFP_KERNEL );if (!enet_addr_cont) { -ugeth_err ("%s: No memory for enet_addr_container_t object." , +ugeth_err ("%s: No memory for enet_addr_container object." , __FUNCTION__);return NULL ; }
@@ -469,16 +469,16 @@ static enet_addr_container_t *get_enet_a }#endif /* CONFIG_UGETH_FILTERING */ -static void put_enet_addr_container (enet_addr_container_t *enet_addr_cont) +static void put_enet_addr_container (struct enet_addr_container *enet_addr_cont) {kfree (enet_addr_cont); }#ifdef CONFIG_UGETH_FILTERING -static int hw_add_addr_in_paddr (ucc_geth_private_t *ugeth, -enet_addr_t *p_enet_addr,u8 paddr_num) +static int hw_add_addr_in_paddr (struct ucc_geth_private *ugeth, +u8 **p_enet_addr,u8 paddr_num) { -ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; +struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;if (!(paddr_num <NUM_OF_PADDRS )) {ugeth_warn ("%s: Illagel paddr_num." , __FUNCTION__);
@@ -486,7 +486,7 @@ static int hw_add_addr_in_paddr(ucc_geth } p_82xx_addr_filt = - (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> + (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram-> addressfiltering;/* Ethernet frames are defined in Little Endian mode, */
@@ -505,9 +505,9 @@ static int hw_add_addr_in_paddr(ucc_geth }#endif /* CONFIG_UGETH_FILTERING */ -static int hw_clear_addr_in_paddr (ucc_geth_private_t *ugeth,u8 paddr_num) +static int hw_clear_addr_in_paddr (struct ucc_geth_private *ugeth,u8 paddr_num) { -ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; +struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;if (!(paddr_num <NUM_OF_PADDRS )) {ugeth_warn ("%s: Illagel paddr_num." , __FUNCTION__);
@@ -515,7 +515,7 @@ static int hw_clear_addr_in_paddr(ucc_ge } p_82xx_addr_filt = - (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> + (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram-> addressfiltering;/* Writing address ff.ff.ff.ff.ff.ff disables address
@@ -527,14 +527,14 @@ static int hw_clear_addr_in_paddr(ucc_gereturn 0 ; } -static void hw_add_addr_in_hash (ucc_geth_private_t *ugeth, -enet_addr_t *p_enet_addr) +static void hw_add_addr_in_hash (struct ucc_geth_private *ugeth, +u8 **p_enet_addr) { -ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; +struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;u32 cecr_subblock; p_82xx_addr_filt = - (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> + (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram-> addressfiltering; cecr_subblock =
@@ -558,10 +558,10 @@ static void hw_add_addr_in_hash(ucc_geth }#ifdef CONFIG_UGETH_MAGIC_PACKET -static void magic_packet_detection_enable (ucc_geth_private_t *ugeth) +static void magic_packet_detection_enable (struct ucc_geth_private *ugeth) { -ucc_fast_private_t *uccf; -ucc_geth_t *ug_regs; +struct ucc_fast_private *uccf; +struct ucc_geth *ug_regs;u32 maccfg2, uccm; uccf = ugeth->uccf;
@@ -578,10 +578,10 @@ static void magic_packet_detection_enablout_be32 (&ug_regs->maccfg2, maccfg2); } -static void magic_packet_detection_disable (ucc_geth_private_t *ugeth) +static void magic_packet_detection_disable (struct ucc_geth_private *ugeth) { -ucc_fast_private_t *uccf; -ucc_geth_t *ug_regs; +struct ucc_fast_private *uccf; +struct ucc_geth *ug_regs;u32 maccfg2, uccm; uccf = ugeth->uccf;
@@ -599,26 +599,26 @@ static void magic_packet_detection_disab }#endif /* MAGIC_PACKET */ -static inline int compare_addr (enet_addr_t *addr1,enet_addr_t *addr2) +static inline int compare_addr (u8 **addr1,u8 **addr2) {return memcmp (addr1, addr2,ENET_NUM_OCTETS_PER_ADDRESS ); }#ifdef DEBUG -static void get_statistics (ucc_geth_private_t *ugeth, -ucc_geth_tx_firmware_statistics_t * +static void get_statistics (struct ucc_geth_private *ugeth, +struct ucc_geth_tx_firmware_statistics * tx_firmware_statistics, -ucc_geth_rx_firmware_statistics_t * +struct ucc_geth_rx_firmware_statistics * rx_firmware_statistics, -ucc_geth_hardware_statistics_t *hardware_statistics) +struct ucc_geth_hardware_statistics *hardware_statistics) { -ucc_fast_t *uf_regs; -ucc_geth_t *ug_regs; -ucc_geth_tx_firmware_statistics_pram_t *p_tx_fw_statistics_pram; -ucc_geth_rx_firmware_statistics_pram_t *p_rx_fw_statistics_pram; +struct ucc_fast *uf_regs; +struct ucc_geth *ug_regs; +struct ucc_geth_tx_firmware_statistics_pram *p_tx_fw_statistics_pram; +struct ucc_geth_rx_firmware_statistics_pram *p_rx_fw_statistics_pram; ug_regs = ugeth->ug_regs; - uf_regs = (ucc_fast_t *) ug_regs; + uf_regs = (struct ucc_fast *) ug_regs; p_tx_fw_statistics_pram = ugeth->p_tx_fw_statistics_pram; p_rx_fw_statistics_pram = ugeth->p_rx_fw_statistics_pram;
@@ -724,7 +724,7 @@ static void get_statistics(ucc_geth_priv } } -static void dump_bds (ucc_geth_private_t *ugeth) +static void dump_bds (struct ucc_geth_private *ugeth) {int i;int length;
@@ -749,7 +749,7 @@ static void dump_bds(ucc_geth_private_t } } -static void dump_regs (ucc_geth_private_t *ugeth) +static void dump_regs (struct ucc_geth_private *ugeth) {int i;
@@ -890,7 +890,7 @@ static void dump_regs(ucc_geth_private_tugeth_info ("Base address: 0x%08x" , (u32) & ugeth->p_thread_data_tx[i]);mem_disp ((u8 *) & ugeth->p_thread_data_tx[i], -sizeof (ucc_geth_thread_data_tx_t)); +sizeof (struct ucc_geth_thread_data_tx )); } }if (ugeth->p_thread_data_rx) {
@@ -924,7 +924,7 @@ static void dump_regs(ucc_geth_private_tugeth_info ("Base address: 0x%08x" , (u32) & ugeth->p_thread_data_rx[i]);mem_disp ((u8 *) & ugeth->p_thread_data_rx[i], -sizeof (ucc_geth_thread_data_rx_t)); +sizeof (struct ucc_geth_thread_data_rx )); } }if (ugeth->p_exf_glbl_param) {
@@ -1102,7 +1102,7 @@ static void dump_regs(ucc_geth_private_tugeth_info ("Base address: 0x%08x" , (u32) & ugeth->p_send_q_mem_reg->sqqd[i]);mem_disp ((u8 *) & ugeth->p_send_q_mem_reg->sqqd[i], -sizeof (ucc_geth_send_queue_qd_t)); +sizeof (struct ucc_geth_send_queue_qd )); } }if (ugeth->p_scheduler) {
@@ -1184,7 +1184,7 @@ static void dump_regs(ucc_geth_private_tqe_muram_addr (in_be32 (&ugeth->p_rx_bd_qs_tbl[i]. bdbaseptr)), - sizeof(ucc_geth_rx_prefetched_bds_t)); + sizeof(struct ucc_geth_rx_prefetched_bds)); } }if (ugeth->p_init_enet_param_shadow) {
@@ -1195,7 +1195,7 @@ static void dump_regs(ucc_geth_private_tmem_disp ((u8 *) ugeth->p_init_enet_param_shadow,sizeof (*ugeth->p_init_enet_param_shadow)); - size =sizeof (ucc_geth_thread_rx_pram_t); + size =sizeof (struct ucc_geth_thread_rx_pram );if (ugeth->ug_info->rxExtendedFiltering) { size +=THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING ;
@@ -1213,7 +1213,7 @@ static void dump_regs(ucc_geth_private_t &(ugeth->p_init_enet_param_shadow-> txthread[0 ]),ENET_INIT_PARAM_MAX_ENTRIES_TX , -sizeof (ucc_geth_thread_tx_pram_t), +sizeof (struct ucc_geth_thread_tx_pram ), ugeth->ug_info->riscTx, 0); dump_init_enet_entries(ugeth, &(ugeth->p_init_enet_param_shadow->
@@ -1575,12 +1575,12 @@ static int init_min_frame_len(u16 min_frreturn 0 ; } -static int adjust_enet_interface (ucc_geth_private_t *ugeth) +static int adjust_enet_interface (struct ucc_geth_private *ugeth) { -ucc_geth_info_t *ug_info; -ucc_geth_t *ug_regs; -ucc_fast_t *uf_regs; -enet_speed_e speed; +struct ucc_geth_info *ug_info; +struct ucc_geth *ug_regs; +struct ucc_fast *uf_regs; +enum enet_speed speed;int ret_val, rpm =0 , tbi =0 , r10m =0 , rmm =0 , limited_to_full_duplex =0 ;u32 upsmr, maccfg2, utbipar, tbiBaseAddress;
@@ -1688,8 +1688,8 @@ static int adjust_enet_interface(ucc_get*/ static void adjust_link (struct net_device *dev) { -ucc_geth_private_t *ugeth =netdev_priv (dev); -ucc_geth_t *ug_regs; +struct ucc_geth_private *ugeth =netdev_priv (dev); +struct ucc_geth *ug_regs;u32 tempval;struct ugeth_mii_info *mii_info = ugeth->mii_info;
@@ -1824,9 +1824,9 @@ #endif /* CONFIG_MPC8360 */*/ static int init_phy (struct net_device *dev) { -ucc_geth_private_t *ugeth =netdev_priv (dev); +struct ucc_geth_private *ugeth =netdev_priv (dev);struct phy_info *curphy; -ucc_mii_mng_t *mii_regs; +struct ucc_mii_mng *mii_regs;struct ugeth_mii_info *mii_info;int err;
@@ -1911,17 +1911,17 @@ static int init_phy(struct net_device *d }#ifdef CONFIG_UGETH_TX_ON_DEMOND -static int ugeth_transmit_on_demand (ucc_geth_private_t *ugeth) +static int ugeth_transmit_on_demand (struct ucc_geth_private *ugeth) { -ucc_fast_transmit_on_demand (ugeth->uccf); + struct ucc_fastransmit_on_demand(ugeth->uccf);return 0 ; }#endif -static int ugeth_graceful_stop_tx (ucc_geth_private_t *ugeth) +static int ugeth_graceful_stop_tx (struct ucc_geth_private *ugeth) { -ucc_fast_private_t *uccf; +struct ucc_fast_private *uccf;u32 cecr_subblock;u32 temp;
@@ -1949,9 +1949,9 @@ static int ugeth_graceful_stop_tx(ucc_gereturn 0 ; } -static int ugeth_graceful_stop_rx (ucc_geth_private_t * ugeth) +static int ugeth_graceful_stop_rx (struct ucc_geth_private * ugeth) { -ucc_fast_private_t *uccf; +struct ucc_fast_private *uccf;u32 cecr_subblock;u8 temp;
@@ -1980,9 +1980,9 @@ static int ugeth_graceful_stop_rx(ucc_gereturn 0 ; } -static int ugeth_restart_tx (ucc_geth_private_t *ugeth) +static int ugeth_restart_tx (struct ucc_geth_private *ugeth) { -ucc_fast_private_t *uccf; +struct ucc_fast_private *uccf;u32 cecr_subblock; uccf = ugeth->uccf;
@@ -1996,9 +1996,9 @@ static int ugeth_restart_tx(ucc_geth_prireturn 0 ; } -static int ugeth_restart_rx (ucc_geth_private_t *ugeth) +static int ugeth_restart_rx (struct ucc_geth_private *ugeth) { -ucc_fast_private_t *uccf; +struct ucc_fast_private *uccf;u32 cecr_subblock; uccf = ugeth->uccf;
@@ -2012,9 +2012,9 @@ static int ugeth_restart_rx(ucc_geth_prireturn 0 ; } -static int ugeth_enable (ucc_geth_private_t *ugeth,comm_dir_e mode) +static int ugeth_enable (struct ucc_geth_private *ugeth,enum comm_dir mode) { -ucc_fast_private_t *uccf; +struct ucc_fast_private *uccf;int enabled_tx, enabled_rx; uccf = ugeth->uccf;
@@ -2041,9 +2041,9 @@ static int ugeth_enable(ucc_geth_private } -static int ugeth_disable (ucc_geth_private_t * ugeth,comm_dir_e mode) +static int ugeth_disable (struct ucc_geth_private * ugeth,enum comm_dir mode) { -ucc_fast_private_t *uccf; +struct ucc_fast_private *uccf; uccf = ugeth->uccf;
@@ -2066,7 +2066,7 @@ static int ugeth_disable(ucc_geth_privatreturn 0 ; } -static void ugeth_dump_regs (ucc_geth_private_t *ugeth) +static void ugeth_dump_regs (struct ucc_geth_private *ugeth) {#ifdef DEBUG ucc_fast_dump_regs (ugeth->uccf);
@@ -2076,9 +2076,9 @@ #endif }#ifdef CONFIG_UGETH_FILTERING -static int ugeth_ext_filtering_serialize_tad (ucc_geth_tad_params_t * +static int ugeth_ext_filtering_serialize_tad (struct ucc_geth_tad_params * p_UccGethTadParams, -qe_fltr_tad_t *qe_fltr_tad) +struct qe_fltr_tad *qe_fltr_tad) {u16 temp;
@@ -2116,11 +2116,11 @@ static int ugeth_ext_filtering_serializereturn 0 ; } -static enet_addr_container_t - *ugeth_82xx_filtering_get_match_addr_in_hash (ucc_geth_private_t *ugeth, -enet_addr_t *p_enet_addr) +static struct enet_addr_container_t + *ugeth_82xx_filtering_get_match_addr_in_hash (struct ucc_geth_private *ugeth, +struct enet_addr *p_enet_addr) { -enet_addr_container_t *enet_addr_cont; +struct enet_addr_container *enet_addr_cont;struct list_head *p_lh;u16 i, num;int32_t j;
@@ -2141,7 +2141,7 @@ static enet_addr_container_tfor (i =0 ; i < num; i++) { enet_addr_cont = - (enet_addr_container_t *) + (struct enet_addr_container *)ENET_ADDR_CONT_ENTRY (dequeue (p_lh));for (j =ENET_NUM_OCTETS_PER_ADDRESS -1 ; j >=0 ; j--) {if ((*p_enet_addr)[j] != (enet_addr_cont->address)[j])
@@ -2154,11 +2154,11 @@ static enet_addr_container_treturn NULL ; } -static int ugeth_82xx_filtering_add_addr_in_hash (ucc_geth_private_t *ugeth, -enet_addr_t *p_enet_addr) +static int ugeth_82xx_filtering_add_addr_in_hash (struct ucc_geth_private *ugeth, +struct enet_addr *p_enet_addr) { -ucc_geth_enet_address_recognition_location_e location; -enet_addr_container_t *enet_addr_cont; +enum ucc_geth_enet_address_recognition_location location; +struct enet_addr_container *enet_addr_cont;struct list_head *p_lh;u8 i;u32 limit;
@@ -2198,13 +2198,13 @@ static int ugeth_82xx_filtering_add_addrreturn 0 ; } -static int ugeth_82xx_filtering_clear_addr_in_hash (ucc_geth_private_t *ugeth, -enet_addr_t *p_enet_addr) +static int ugeth_82xx_filtering_clear_addr_in_hash (struct ucc_geth_private *ugeth, +struct enet_addr *p_enet_addr) { -ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; -enet_addr_container_t *enet_addr_cont; -ucc_fast_private_t *uccf; -comm_dir_e comm_dir; +struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; +struct enet_addr_container *enet_addr_cont; +struct ucc_fast_private *uccf; +enum comm_dir comm_dir;u16 i, num;struct list_head *p_lh;u32 *addr_h, *addr_l;
@@ -2213,7 +2213,7 @@ static int ugeth_82xx_filtering_clear_ad uccf = ugeth->uccf; p_82xx_addr_filt = - (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> + (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram-> addressfiltering; if (!
@@ -2253,7 +2253,7 @@ static int ugeth_82xx_filtering_clear_ad num = --(*p_counter);for (i =0 ; i < num; i++) { enet_addr_cont = - (enet_addr_container_t *) + (struct enet_addr_container *)ENET_ADDR_CONT_ENTRY (dequeue (p_lh));hw_add_addr_in_hash (ugeth, &(enet_addr_cont->address));enqueue (p_lh, &enet_addr_cont->node);/* Put it back */
@@ -2266,14 +2266,14 @@ static int ugeth_82xx_filtering_clear_ad }#endif /* CONFIG_UGETH_FILTERING */ -static int ugeth_82xx_filtering_clear_all_addr_in_hash (ucc_geth_private_t * +static int ugeth_82xx_filtering_clear_all_addr_in_hash (struct ucc_geth_private * ugeth, -enet_addr_type_e +enum enet_addr_type enet_addr_type) { -ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; -ucc_fast_private_t *uccf; -comm_dir_e comm_dir; +struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; +struct ucc_fast_private *uccf; +enum comm_dir comm_dir;struct list_head *p_lh;u16 i, num;u32 *addr_h, *addr_l;
@@ -2282,7 +2282,7 @@ static int ugeth_82xx_filtering_clear_al uccf = ugeth->uccf; p_82xx_addr_filt = - (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> + (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram-> addressfiltering;if (enet_addr_type ==ENET_ADDR_TYPE_GROUP ) {
@@ -2328,8 +2328,8 @@ static int ugeth_82xx_filtering_clear_al }#ifdef CONFIG_UGETH_FILTERING -static int ugeth_82xx_filtering_add_addr_in_paddr (ucc_geth_private_t *ugeth, -enet_addr_t *p_enet_addr, +static int ugeth_82xx_filtering_add_addr_in_paddr (struct ucc_geth_private *ugeth, +struct enet_addr *p_enet_addr,u8 paddr_num) {int i;
@@ -2349,14 +2349,14 @@ static int ugeth_82xx_filtering_add_addr }#endif /* CONFIG_UGETH_FILTERING */ -static int ugeth_82xx_filtering_clear_addr_in_paddr (ucc_geth_private_t *ugeth, +static int ugeth_82xx_filtering_clear_addr_in_paddr (struct ucc_geth_private *ugeth,u8 paddr_num) { ugeth->indAddrRegUsed[paddr_num] =0 ;/* mark this paddr as not used */ return hw_clear_addr_in_paddr (ugeth, paddr_num);/* clear in hardware */ } -static void ucc_geth_memclean (ucc_geth_private_t *ugeth) +static void ucc_geth_memclean (struct ucc_geth_private *ugeth) {u16 i, j;u8 *bd;
@@ -2493,11 +2493,11 @@ static void ucc_geth_memclean(ucc_geth_pstatic void ucc_geth_set_multi (struct net_device *dev) { -ucc_geth_private_t *ugeth; +struct ucc_geth_private *ugeth;struct dev_mc_list *dmi; -ucc_fast_t *uf_regs; -ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; -enet_addr_t tempaddr; +struct ucc_fast *uf_regs; +struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; +u8 *tempaddr;u8 *mcptr, *tdptr;int i, j;
@@ -2514,7 +2514,7 @@ static void ucc_geth_set_multi(struct ne uf_regs->upsmr &= ~UPSMR_PRO ; p_82xx_addr_filt = - (ucc_geth_82xx_address_filtering_pram_t *) ugeth-> + (struct ucc_geth_82xx_address_filtering_pram *) ugeth-> p_rx_glbl_pram->addressfiltering;if (dev->flags &IFF_ALLMULTI ) {
@@ -2557,9 +2557,9 @@ static void ucc_geth_set_multi(struct ne } } -static void ucc_geth_stop (ucc_geth_private_t *ugeth) +static void ucc_geth_stop (struct ucc_geth_private *ugeth) { -ucc_geth_t *ug_regs = ugeth->ug_regs; +struct ucc_geth *ug_regs = ugeth->ug_regs;u32 tempval;ugeth_vdbg ("%s: IN" , __FUNCTION__);
@@ -2602,15 +2602,15 @@ static void ucc_geth_stop(ucc_geth_privaucc_geth_memclean (ugeth); } -static int ucc_geth_startup (ucc_geth_private_t *ugeth) +static int ucc_geth_startup (struct ucc_geth_private *ugeth) { -ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; -ucc_geth_init_pram_t *p_init_enet_pram; -ucc_fast_private_t *uccf; -ucc_geth_info_t *ug_info; -ucc_fast_info_t *uf_info; -ucc_fast_t *uf_regs; -ucc_geth_t *ug_regs; +struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; +struct ucc_geth_init_pram *p_init_enet_pram; +struct ucc_fast_private *uccf; +struct ucc_geth_info *ug_info; +struct ucc_fast_info *uf_info; +struct ucc_fast *uf_regs; +struct ucc_geth *ug_regs;int ret_val = -EINVAL ;u32 remoder =UCC_GETH_REMODER_INIT ;u32 init_enet_pram_offset, cecr_subblock, command, maccfg1;
@@ -2785,7 +2785,7 @@ static int ucc_geth_startup(ucc_geth_pri UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP); uf_regs = uccf->uf_regs; - ug_regs = (ucc_geth_t *) (uccf->uf_regs); + ug_regs = (struct ucc_geth *) (uccf->uf_regs); ugeth->ug_regs = ug_regs; init_default_reg_vals(&uf_regs->upsmr,
@@ -3000,7 +3000,7 @@ static int ucc_geth_startup(ucc_geth_pri/* Tx global PRAM */ /* Allocate global tx parameter RAM page */ ugeth->tx_glbl_pram_offset = -qe_muram_alloc (sizeof (ucc_geth_tx_global_pram_t), +qe_muram_alloc (sizeof (struct ucc_geth_tx_global_pram ),UCC_GETH_TX_GLOBAL_PRAM_ALIGNMENT );if (IS_MURAM_ERR (ugeth->tx_glbl_pram_offset)) { ugeth_err
@@ -3010,10 +3010,10 @@ static int ucc_geth_startup(ucc_geth_prireturn -ENOMEM ; } ugeth->p_tx_glbl_pram = - (ucc_geth_tx_global_pram_t *)qe_muram_addr (ugeth-> + (struct ucc_geth_tx_global_pram *)qe_muram_addr (ugeth-> tx_glbl_pram_offset);/* Zero out p_tx_glbl_pram */ -memset (ugeth->p_tx_glbl_pram,0 ,sizeof (ucc_geth_tx_global_pram_t)); +memset (ugeth->p_tx_glbl_pram,0 ,sizeof (struct ucc_geth_tx_global_pram ));/* Fill global PRAM */
@@ -3021,7 +3021,7 @@ static int ucc_geth_startup(ucc_geth_pri/* Size varies with number of Tx threads */ ugeth->thread_dat_tx_offset =qe_muram_alloc (numThreadsTxNumerical * -sizeof (ucc_geth_thread_data_tx_t) + +sizeof (struct ucc_geth_thread_data_tx ) +32 * (numThreadsTxNumerical ==1 ),UCC_GETH_THREAD_DATA_ALIGNMENT );if (IS_MURAM_ERR (ugeth->thread_dat_tx_offset)) {
@@ -3033,7 +3033,7 @@ static int ucc_geth_startup(ucc_geth_pri } ugeth->p_thread_data_tx = - (ucc_geth_thread_data_tx_t *)qe_muram_addr (ugeth-> + (struct ucc_geth_thread_data_tx *)qe_muram_addr (ugeth-> thread_dat_tx_offset);out_be32 (&ugeth->p_tx_glbl_pram->tqptr, ugeth->thread_dat_tx_offset);
@@ -3050,7 +3050,7 @@ static int ucc_geth_startup(ucc_geth_pri/* Size varies with number of Tx queues */ ugeth->send_q_mem_reg_offset =qe_muram_alloc (ug_info->numQueuesTx * -sizeof (ucc_geth_send_queue_qd_t), +sizeof (struct ucc_geth_send_queue_qd ),UCC_GETH_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT );if (IS_MURAM_ERR (ugeth->send_q_mem_reg_offset)) { ugeth_err
@@ -3061,7 +3061,7 @@ static int ucc_geth_startup(ucc_geth_pri } ugeth->p_send_q_mem_reg = - (ucc_geth_send_queue_mem_region_t *)qe_muram_addr (ugeth-> + (struct ucc_geth_send_queue_mem_region *)qe_muram_addr (ugeth-> send_q_mem_reg_offset);out_be32 (&ugeth->p_tx_glbl_pram->sqptr, ugeth->send_q_mem_reg_offset);
@@ -3093,7 +3093,7 @@ static int ucc_geth_startup(ucc_geth_priif (ug_info->numQueuesTx >1 ) {/* scheduler exists only if more than 1 tx queue */ ugeth->scheduler_offset = -qe_muram_alloc (sizeof (ucc_geth_scheduler_t), +qe_muram_alloc (sizeof (struct ucc_geth_scheduler ),UCC_GETH_SCHEDULER_ALIGNMENT );if (IS_MURAM_ERR (ugeth->scheduler_offset)) { ugeth_err
@@ -3104,12 +3104,12 @@ static int ucc_geth_startup(ucc_geth_pri } ugeth->p_scheduler = - (ucc_geth_scheduler_t *)qe_muram_addr (ugeth-> + (struct ucc_geth_scheduler *)qe_muram_addr (ugeth-> scheduler_offset);out_be32 (&ugeth->p_tx_glbl_pram->schedulerbasepointer, ugeth->scheduler_offset);/* Zero out p_scheduler */ -memset (ugeth->p_scheduler,0 ,sizeof (ucc_geth_scheduler_t)); +memset (ugeth->p_scheduler,0 ,sizeof (struct ucc_geth_scheduler ));/* Set values in scheduler */ out_be32(&ugeth->p_scheduler->mblinterval,
@@ -3141,7 +3141,7 @@ static int ucc_geth_startup(ucc_geth_pri statisticsMode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_TX) { ugeth->tx_fw_statistics_pram_offset =qe_muram_alloc (sizeof - (ucc_geth_tx_firmware_statistics_pram_t), + (struct ucc_geth_tx_firmware_statistics_pram ),UCC_GETH_TX_STATISTICS_ALIGNMENT );if (IS_MURAM_ERR (ugeth->tx_fw_statistics_pram_offset)) { ugeth_err
@@ -3151,11 +3151,11 @@ static int ucc_geth_startup(ucc_geth_prireturn -ENOMEM ; } ugeth->p_tx_fw_statistics_pram = - (ucc_geth_tx_firmware_statistics_pram_t *) + (struct ucc_geth_tx_firmware_statistics_pram *)qe_muram_addr (ugeth->tx_fw_statistics_pram_offset);/* Zero out p_tx_fw_statistics_pram */ memset (ugeth->p_tx_fw_statistics_pram, -0 ,sizeof (ucc_geth_tx_firmware_statistics_pram_t)); +0 ,sizeof (struct ucc_geth_tx_firmware_statistics_pram )); }/* temoder */
@@ -3180,7 +3180,7 @@ static int ucc_geth_startup(ucc_geth_pri/* Rx global PRAM */ /* Allocate global rx parameter RAM page */ ugeth->rx_glbl_pram_offset = -qe_muram_alloc (sizeof (ucc_geth_rx_global_pram_t), +qe_muram_alloc (sizeof (struct ucc_geth_rx_global_pram ),UCC_GETH_RX_GLOBAL_PRAM_ALIGNMENT );if (IS_MURAM_ERR (ugeth->rx_glbl_pram_offset)) { ugeth_err
@@ -3190,10 +3190,10 @@ static int ucc_geth_startup(ucc_geth_prireturn -ENOMEM ; } ugeth->p_rx_glbl_pram = - (ucc_geth_rx_global_pram_t *)qe_muram_addr (ugeth-> + (struct ucc_geth_rx_global_pram *)qe_muram_addr (ugeth-> rx_glbl_pram_offset);/* Zero out p_rx_glbl_pram */ -memset (ugeth->p_rx_glbl_pram,0 ,sizeof (ucc_geth_rx_global_pram_t)); +memset (ugeth->p_rx_glbl_pram,0 ,sizeof (struct ucc_geth_rx_global_pram ));/* Fill global PRAM */
@@ -3201,7 +3201,7 @@ static int ucc_geth_startup(ucc_geth_pri/* Size varies with number of Rx threads */ ugeth->thread_dat_rx_offset =qe_muram_alloc (numThreadsRxNumerical * -sizeof (ucc_geth_thread_data_rx_t), +sizeof (struct ucc_geth_thread_data_rx ),UCC_GETH_THREAD_DATA_ALIGNMENT );if (IS_MURAM_ERR (ugeth->thread_dat_rx_offset)) { ugeth_err
@@ -3212,7 +3212,7 @@ static int ucc_geth_startup(ucc_geth_pri } ugeth->p_thread_data_rx = - (ucc_geth_thread_data_rx_t *)qe_muram_addr (ugeth-> + (struct ucc_geth_thread_data_rx *)qe_muram_addr (ugeth-> thread_dat_rx_offset);out_be32 (&ugeth->p_rx_glbl_pram->rqptr, ugeth->thread_dat_rx_offset);
@@ -3224,7 +3224,7 @@ static int ucc_geth_startup(ucc_geth_pri statisticsMode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_RX) { ugeth->rx_fw_statistics_pram_offset =qe_muram_alloc (sizeof - (ucc_geth_rx_firmware_statistics_pram_t), + (struct ucc_geth_rx_firmware_statistics_pram ),UCC_GETH_RX_STATISTICS_ALIGNMENT );if (IS_MURAM_ERR (ugeth->rx_fw_statistics_pram_offset)) { ugeth_err
@@ -3234,11 +3234,11 @@ static int ucc_geth_startup(ucc_geth_prireturn -ENOMEM ; } ugeth->p_rx_fw_statistics_pram = - (ucc_geth_rx_firmware_statistics_pram_t *) + (struct ucc_geth_rx_firmware_statistics_pram *)qe_muram_addr (ugeth->rx_fw_statistics_pram_offset);/* Zero out p_rx_fw_statistics_pram */ memset (ugeth->p_rx_fw_statistics_pram,0 , -sizeof (ucc_geth_rx_firmware_statistics_pram_t)); +sizeof (struct ucc_geth_rx_firmware_statistics_pram )); }/* intCoalescingPtr */
@@ -3246,7 +3246,7 @@ static int ucc_geth_startup(ucc_geth_pri/* Size varies with number of Rx queues */ ugeth->rx_irq_coalescing_tbl_offset =qe_muram_alloc (ug_info->numQueuesRx * -sizeof (ucc_geth_rx_interrupt_coalescing_entry_t), +sizeof (struct ucc_geth_rx_interrupt_coalescing_entry ),UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT );if (IS_MURAM_ERR (ugeth->rx_irq_coalescing_tbl_offset)) { ugeth_err
@@ -3257,7 +3257,7 @@ static int ucc_geth_startup(ucc_geth_pri } ugeth->p_rx_irq_coalescing_tbl = - (ucc_geth_rx_interrupt_coalescing_table_t *) + (struct ucc_geth_rx_interrupt_coalescing_table *)qe_muram_addr (ugeth->rx_irq_coalescing_tbl_offset);out_be32 (&ugeth->p_rx_glbl_pram->intcoalescingptr, ugeth->rx_irq_coalescing_tbl_offset);
@@ -3313,8 +3313,8 @@ static int ucc_geth_startup(ucc_geth_pri/* Size varies with number of Rx queues */ ugeth->rx_bd_qs_tbl_offset =qe_muram_alloc (ug_info->numQueuesRx * - (sizeof (ucc_geth_rx_bd_queues_entry_t) + -sizeof (ucc_geth_rx_prefetched_bds_t)), + (sizeof (struct ucc_geth_rx_bd_queues_entry ) + +sizeof (struct ucc_geth_rx_prefetched_bds )),UCC_GETH_RX_BD_QUEUES_ALIGNMENT );if (IS_MURAM_ERR (ugeth->rx_bd_qs_tbl_offset)) { ugeth_err
@@ -3325,14 +3325,14 @@ static int ucc_geth_startup(ucc_geth_pri } ugeth->p_rx_bd_qs_tbl = - (ucc_geth_rx_bd_queues_entry_t *)qe_muram_addr (ugeth-> + (struct ucc_geth_rx_bd_queues_entry *)qe_muram_addr (ugeth-> rx_bd_qs_tbl_offset);out_be32 (&ugeth->p_rx_glbl_pram->rbdqptr, ugeth->rx_bd_qs_tbl_offset);/* Zero out p_rx_bd_qs_tbl */ memset (ugeth->p_rx_bd_qs_tbl,0 , - ug_info->numQueuesRx * (sizeof (ucc_geth_rx_bd_queues_entry_t) + -sizeof (ucc_geth_rx_prefetched_bds_t))); + ug_info->numQueuesRx * (sizeof (struct ucc_geth_rx_bd_queues_entry ) + +sizeof (struct ucc_geth_rx_prefetched_bds )));/* Setup the table */ /* Assume BD rings are already established */
@@ -3403,7 +3403,7 @@ static int ucc_geth_startup(ucc_geth_pri/* Allocate memory for extended filtering Mode Global Parameters */ ugeth->exf_glbl_param_offset = -qe_muram_alloc (sizeof (ucc_geth_exf_global_pram_t), +qe_muram_alloc (sizeof (struct ucc_geth_exf_global_pram ),UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT );if (IS_MURAM_ERR (ugeth->exf_glbl_param_offset)) { ugeth_err
@@ -3414,7 +3414,7 @@ static int ucc_geth_startup(ucc_geth_pri } ugeth->p_exf_glbl_param = - (ucc_geth_exf_global_pram_t *)qe_muram_addr (ugeth-> + (struct ucc_geth_exf_global_pram *)qe_muram_addr (ugeth-> exf_glbl_param_offset);out_be32 (&ugeth->p_rx_glbl_pram->exfGlobalParam, ugeth->exf_glbl_param_offset);
@@ -3436,7 +3436,7 @@ static int ucc_geth_startup(ucc_geth_priINIT_LIST_HEAD (&ugeth->ind_hash_q); } p_82xx_addr_filt = - (ucc_geth_82xx_address_filtering_pram_t *) ugeth-> + (struct ucc_geth_82xx_address_filtering_pram *) ugeth-> p_rx_glbl_pram->addressfiltering; ugeth_82xx_filtering_clear_all_addr_in_hash(ugeth,
@@ -3459,7 +3459,7 @@ static int ucc_geth_startup(ucc_geth_pri* allocated resources can be released when the channel is freed. */ if (!(ugeth->p_init_enet_param_shadow = - (ucc_geth_init_pram_t *)kmalloc (sizeof (ucc_geth_init_pram_t), + (struct ucc_geth_init_pram *)kmalloc (sizeof (struct ucc_geth_init_pram ),GFP_KERNEL ))) {ugeth_err ("%s: Can not allocate memory for"
@@ -3469,7 +3469,7 @@ static int ucc_geth_startup(ucc_geth_pri }/* Zero out *p_init_enet_param_shadow */ memset ((char *)ugeth->p_init_enet_param_shadow, -0 ,sizeof (ucc_geth_init_pram_t)); +0 ,sizeof (struct ucc_geth_init_pram ));/* Fill shadow InitEnet command parameter structure */
@@ -3503,7 +3503,7 @@ static int ucc_geth_startup(ucc_geth_pri } ugeth->p_init_enet_param_shadow->largestexternallookupkeysize = ug_info->largestexternallookupkeysize; - size =sizeof (ucc_geth_thread_rx_pram_t); + size =sizeof (struct ucc_geth_thread_rx_pram );if (ug_info->rxExtendedFiltering) { size +=THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING ; if (ug_info->largestexternallookupkeysize ==
@@ -3534,7 +3534,7 @@ static int ucc_geth_startup(ucc_geth_pri fill_init_enet_entries(ugeth, &(ugeth->p_init_enet_param_shadow-> txthread[0]), numThreadsTxNumerical, - sizeof(ucc_geth_thread_tx_pram_t), + sizeof(struct ucc_geth_thread_tx_pram), UCC_GETH_THREAD_TX_PRAM_ALIGNMENT, ug_info->riscTx, 0)) != 0) { ugeth_err("%s: Can not fill p_init_enet_param_shadow.",
@@ -3554,7 +3554,7 @@ static int ucc_geth_startup(ucc_geth_pri }/* Allocate InitEnet command parameter structure */ - init_enet_pram_offset =qe_muram_alloc (sizeof (ucc_geth_init_pram_t),4 ); + init_enet_pram_offset =qe_muram_alloc (sizeof (struct ucc_geth_init_pram ),4 );if (IS_MURAM_ERR (init_enet_pram_offset)) { ugeth_err ("%s: Can not allocate DPRAM memory for p_init_enet_pram.",
@@ -3563,7 +3563,7 @@ static int ucc_geth_startup(ucc_geth_prireturn -ENOMEM ; } p_init_enet_pram = - (ucc_geth_init_pram_t *)qe_muram_addr (init_enet_pram_offset); + (struct ucc_geth_init_pram *)qe_muram_addr (init_enet_pram_offset);/* Copy shadow InitEnet command parameter structure into PRAM */ p_init_enet_pram->resinit1 = ugeth->p_init_enet_param_shadow->resinit1;
@@ -3600,7 +3600,7 @@ static int ucc_geth_startup(ucc_geth_pri/* returns a net_device_stats structure pointer */ static struct net_device_stats *ucc_geth_get_stats (struct net_device *dev) { -ucc_geth_private_t *ugeth =netdev_priv (dev); +struct ucc_geth_private *ugeth =netdev_priv (dev);return &(ugeth->stats); }
@@ -3611,7 +3611,7 @@ static struct net_device_stats *ucc_geth* starting over will fix the problem. */ static void ucc_geth_timeout (struct net_device *dev) { -ucc_geth_private_t *ugeth =netdev_priv (dev); +struct ucc_geth_private *ugeth =netdev_priv (dev);ugeth_vdbg ("%s: IN" , __FUNCTION__);
@@ -3631,7 +3631,7 @@ static void ucc_geth_timeout(struct net_/* It is pointed to by the dev->hard_start_xmit function pointer */ static int ucc_geth_start_xmit (struct sk_buff *skb,struct net_device *dev) { -ucc_geth_private_t *ugeth =netdev_priv (dev); +struct ucc_geth_private *ugeth =netdev_priv (dev);u8 *bd;/* BD pointer */ u32 bd_status;u8 txQ =0 ;
@@ -3692,7 +3692,7 @@ static int ucc_geth_start_xmit(struct skreturn 0 ; } -static int ucc_geth_rx (ucc_geth_private_t *ugeth,u8 rxQ,int rx_work_limit) +static int ucc_geth_rx (struct ucc_geth_private *ugeth,u8 rxQ,int rx_work_limit) {struct sk_buff *skb;u8 *bd;
@@ -3778,7 +3778,7 @@ #endif /* CONFIG_UGETH_NAPI */static int ucc_geth_tx (struct net_device *dev,u8 txQ) {/* Start from the next BD that should be filled */ -ucc_geth_private_t *ugeth =netdev_priv (dev); +struct ucc_geth_private *ugeth =netdev_priv (dev);u8 *bd;/* BD pointer */ u32 bd_status;
@@ -3820,7 +3820,7 @@ static int ucc_geth_tx(struct net_device#ifdef CONFIG_UGETH_NAPI static int ucc_geth_poll (struct net_device *dev,int *budget) { -ucc_geth_private_t *ugeth =netdev_priv (dev); +struct ucc_geth_private *ugeth =netdev_priv (dev);int howmany;int rx_work_limit = *budget;u8 rxQ =0 ;
@@ -3845,9 +3845,9 @@ static irqreturn_t ucc_geth_irq_handler( struct pt_regs *regs) {struct net_device *dev = (struct net_device *)info; -ucc_geth_private_t *ugeth =netdev_priv (dev); -ucc_fast_private_t *uccf; -ucc_geth_info_t *ug_info; +struct ucc_geth_private *ugeth =netdev_priv (dev); +struct ucc_fast_private *uccf; +struct ucc_geth_info *ug_info; registeru32 ucce =0 ; registeru32 bit_mask =UCCE_RXBF_SINGLE_MASK ; registeru32 tx_mask =UCCE_TXBF_SINGLE_MASK ;
@@ -3910,7 +3910,7 @@ static irqreturn_t ucc_geth_irq_handler(static irqreturn_t phy_interrupt (int irq,void *dev_id,struct pt_regs *regs) {struct net_device *dev = (struct net_device *)dev_id; -ucc_geth_private_t *ugeth =netdev_priv (dev); +struct ucc_geth_private *ugeth =netdev_priv (dev);ugeth_vdbg ("%s: IN" , __FUNCTION__);
@@ -3930,8 +3930,8 @@ static irqreturn_t phy_interrupt(int irqstatic void ugeth_phy_change (void *data) {struct net_device *dev = (struct net_device *)data; -ucc_geth_private_t *ugeth =netdev_priv (dev); -ucc_geth_t *ug_regs; +struct ucc_geth_private *ugeth =netdev_priv (dev); +struct ucc_geth *ug_regs;int result =0 ;ugeth_vdbg ("%s: IN" , __FUNCTION__);
@@ -3961,7 +3961,7 @@ static void ugeth_phy_change(void *data)static void ugeth_phy_timer (unsigned long data) {struct net_device *dev = (struct net_device *)data; -ucc_geth_private_t *ugeth =netdev_priv (dev); +struct ucc_geth_private *ugeth =netdev_priv (dev);schedule_work (&ugeth->tq);
@@ -3977,7 +3977,7 @@ static void ugeth_phy_timer(unsigned lonstatic void ugeth_phy_startup_timer (unsigned long data) {struct ugeth_mii_info *mii_info = (struct ugeth_mii_info *)data; -ucc_geth_private_t *ugeth =netdev_priv (mii_info->dev); +struct ucc_geth_private *ugeth =netdev_priv (mii_info->dev);static int secondary =UGETH_AN_TIMEOUT ;int result;
@@ -4032,7 +4032,7 @@ static void ugeth_phy_startup_timer(unsi/* Returns 0 for success. */ static int ucc_geth_open (struct net_device *dev) { -ucc_geth_private_t *ugeth =netdev_priv (dev); +struct ucc_geth_private *ugeth =netdev_priv (dev);int err;ugeth_vdbg ("%s: IN" , __FUNCTION__);
@@ -4109,7 +4109,7 @@ #endif /* CONFIG_UGETH_NAPI *//* Stops the kernel queue, and halts the controller */ static int ucc_geth_close (struct net_device *dev) { -ucc_geth_private_t *ugeth =netdev_priv (dev); +struct ucc_geth_private *ugeth =netdev_priv (dev);ugeth_vdbg ("%s: IN" , __FUNCTION__);
drivers/net/ucc_geth.h +123 -125
539 lines not on this page · raw message
drivers/net/ucc_geth_phy.c +6 -6
@@ -80,9 +80,9 @@ static u8 *bcsr_regs = NULL;/* configuration has to be done through the TSEC1 MIIM regs */ void write_phy_reg (struct net_device *dev,int mii_id,int regnum,int value) { -ucc_geth_private_t *ugeth =netdev_priv (dev); -ucc_mii_mng_t *mii_regs; -enet_tbi_mii_reg_e mii_reg = (enet_tbi_mii_reg_e ) regnum; +struct ucc_geth_private *ugeth =netdev_priv (dev); +struct ucc_mii_mng *mii_regs; +enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg ) regnum;u32 tmp_reg;ugphy_vdbg ("%s: IN" , __FUNCTION__);
@@ -117,9 +117,9 @@ void write_phy_reg(struct net_device *de/* configuration has to be done through the TSEC1 MIIM regs */ int read_phy_reg (struct net_device *dev,int mii_id,int regnum) { -ucc_geth_private_t *ugeth =netdev_priv (dev); -ucc_mii_mng_t *mii_regs; -enet_tbi_mii_reg_e mii_reg = (enet_tbi_mii_reg_e ) regnum; +struct ucc_geth_private *ugeth =netdev_priv (dev); +struct ucc_mii_mng *mii_regs; +enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg ) regnum;u32 tmp_reg;u16 value;
drivers/net/ucc_geth_phy.h +1 -1
@@ -126,7 +126,7 @@ struct ugeth_mii_info {/* And management functions */ struct phy_info *phyinfo; -ucc_mii_mng_t *mii_regs; +struct ucc_mii_mng *mii_regs;/* forced speed & duplex (no autoneg) * partner speed & duplex & pause (autoneg)
include/linux/fsl_devices.h +3 -3
@@ -122,7 +122,7 @@ struct fsl_spi_platform_data {/* Ethernet interface (phy management and speed) */ -typedef enum enet_interface { +enum enet_interface {ENET_10_MII ,/* 10 Base T, MII interface */ ENET_10_RMII ,/* 10 Base T, RMII interface */ ENET_10_RGMII ,/* 10 Base T, RGMII interface */
@@ -133,7 +133,7 @@ typedef enum enet_interface {ENET_1000_RGMII ,/* 1000 Base T, RGMII interface */ ENET_1000_TBI ,/* 1000 Base T, TBI interface */ ENET_1000_RTBI /* 1000 Base T, RTBI interface */ -} enet_interface_e; +}; struct ucc_geth_platform_data {/* device specific information */
@@ -145,7 +145,7 @@ struct ucc_geth_platform_data {u8 rx_clock;u8 tx_clock;u32 phy_id; -enet_interface_e phy_interface; +enum enet_interface phy_interface;u32 phy_interrupt;u8 mac_addr[6 ]; };
Signature · 1 line
1.4.2.1