Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 742821ce authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8187se: Change to use common eeprom routines in EEPROM_93CX 



The TODO list includes switching this driver to use the common EEPROM
routines in EEPROM_93CX.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Tested by: Bernhard Schiffner <bernhard@schiffner-limbach.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 13a21ad1

drivers/staging/rtl8187se/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config R8187SE 
	depends on PCI && WLAN

	select WIRELESS_EXT

	select WEXT_PRIV

	select EEPROM_93CX6

	default N

	---help---

	  If built as a module, it will be called r8187se.ko.

drivers/staging/rtl8187se/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ EXTRA_CFLAGS += -DENABLE_LPS 


r8187se-objs :=			\

		r8180_core.o		\

		r8180_93cx6.o		\

		r8180_wx.o		\

		r8180_rtl8225z2.o	\

		r8185b_init.o		\

drivers/staging/rtl8187se/TODO

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ TODO: 
- switch to use shared "librtl" instead of private ieee80211 stack

- switch to use LIB80211

- switch to use MAC80211

- switch to use EEPROM_93CX6

- use kernel coding style

- checkpatch.pl fixes

- sparse fixes

drivers/staging/rtl8187se/r8180_93cx6.c

deleted100644 → 0
+0 −146
Original line number Diff line number Diff line 
/*

   This files contains card eeprom (93c46 or 93c56) programming routines,

   memory is addressed by 16 bits words.



   This is part of rtl8180 OpenSource driver.

   Copyright (C) Andrea Merello 2004  <andreamrl@tiscali.it>

   Released under the terms of GPL (General Public Licence)



   Parts of this driver are based on the GPL part of the

   official realtek driver.



   Parts of this driver are based on the rtl8180 driver skeleton

   from Patric Schenke & Andres Salomon.



   Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver.



   We want to tanks the Authors of those projects and the Ndiswrapper

   project Authors.

*/



#include "r8180_93cx6.h"



void eprom_cs(struct net_device *dev, short bit)

{

	if(bit)

		write_nic_byte(dev, EPROM_CMD,

			       (1<<EPROM_CS_SHIFT) | \

			       read_nic_byte(dev, EPROM_CMD)); //enable EPROM

	else

		write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD)\

			       &~(1<<EPROM_CS_SHIFT)); //disable EPROM



	force_pci_posting(dev);

	udelay(EPROM_DELAY);

}





void eprom_ck_cycle(struct net_device *dev)

{

	write_nic_byte(dev, EPROM_CMD,

		       (1<<EPROM_CK_SHIFT) | read_nic_byte(dev,EPROM_CMD));

	force_pci_posting(dev);

	udelay(EPROM_DELAY);

	write_nic_byte(dev, EPROM_CMD,

		       read_nic_byte(dev, EPROM_CMD) &~ (1<<EPROM_CK_SHIFT));

	force_pci_posting(dev);

	udelay(EPROM_DELAY);

}





void eprom_w(struct net_device *dev,short bit)

{

	if(bit)

		write_nic_byte(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) | \

			       read_nic_byte(dev,EPROM_CMD));

	else

		write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev,EPROM_CMD)\

			       &~(1<<EPROM_W_SHIFT));



	force_pci_posting(dev);

	udelay(EPROM_DELAY);

}





short eprom_r(struct net_device *dev)

{

	short bit;



	bit=(read_nic_byte(dev, EPROM_CMD) & (1<<EPROM_R_SHIFT) );

	udelay(EPROM_DELAY);



	if(bit) return 1;

	return 0;

}





void eprom_send_bits_string(struct net_device *dev, short b[], int len)

{

	int i;



	for(i=0; i<len; i++){

		eprom_w(dev, b[i]);

		eprom_ck_cycle(dev);

	}

}





u32 eprom_read(struct net_device *dev, u32 addr)

{

	struct r8180_priv *priv = ieee80211_priv(dev);

	short read_cmd[]={1,1,0};

	short addr_str[8];

	int i;

	int addr_len;

	u32 ret;



	ret=0;

        //enable EPROM programming

	write_nic_byte(dev, EPROM_CMD,

		       (EPROM_CMD_PROGRAM<<EPROM_CMD_OPERATING_MODE_SHIFT));

	force_pci_posting(dev);

	udelay(EPROM_DELAY);



	if (priv->epromtype==EPROM_93c56){

		addr_str[7]=addr & 1;

		addr_str[6]=addr & (1<<1);

		addr_str[5]=addr & (1<<2);

		addr_str[4]=addr & (1<<3);

		addr_str[3]=addr & (1<<4);

		addr_str[2]=addr & (1<<5);

		addr_str[1]=addr & (1<<6);

		addr_str[0]=addr & (1<<7);

		addr_len=8;

	}else{

		addr_str[5]=addr & 1;

		addr_str[4]=addr & (1<<1);

		addr_str[3]=addr & (1<<2);

		addr_str[2]=addr & (1<<3);

		addr_str[1]=addr & (1<<4);

		addr_str[0]=addr & (1<<5);

		addr_len=6;

	}

	eprom_cs(dev, 1);

	eprom_ck_cycle(dev);

	eprom_send_bits_string(dev, read_cmd, 3);

	eprom_send_bits_string(dev, addr_str, addr_len);



	//keep chip pin D to low state while reading.

	//I'm unsure if it is necessary, but anyway shouldn't hurt

	eprom_w(dev, 0);



	for(i=0;i<16;i++){

		//eeprom needs a clk cycle between writing opcode&adr

		//and reading data. (eeprom outs a dummy 0)

		eprom_ck_cycle(dev);

		ret |= (eprom_r(dev)<<(15-i));

	}



	eprom_cs(dev, 0);

	eprom_ck_cycle(dev);



	//disable EPROM programming

	write_nic_byte(dev, EPROM_CMD,

		       (EPROM_CMD_NORMAL<<EPROM_CMD_OPERATING_MODE_SHIFT));

	return ret;

}

drivers/staging/rtl8187se/r8180_93cx6.h

+7 −10
Original line number Diff line number Diff line
@@ -45,13 +45,10 @@ 


#define	EPROM_TXPW_OFDM_CH1_2 0x20



//#define	EPROM_TXPW_CH1_2 0x10

#define	EPROM_TXPW_CH1_2 0x30

#define	EPROM_TXPW_CH3_4 0x11

#define	EPROM_TXPW_CH5_6 0x12

#define	EPROM_TXPW_CH7_8 0x13

#define	EPROM_TXPW_CH9_10 0x14

#define	EPROM_TXPW_CH11_12 0x15

#define	EPROM_TXPW_CH13_14 0x16



u32 eprom_read(struct net_device *dev,u32 addr); //reads a 16 bits word
 


#define RTL818X_EEPROM_CMD_READ		(1 << 0)

#define RTL818X_EEPROM_CMD_WRITE	(1 << 1)

#define RTL818X_EEPROM_CMD_CK		(1 << 2)

#define RTL818X_EEPROM_CMD_CS		(1 << 3)