Skip to content

Commit

Permalink
staging: rtl8192su: move to EEPROM_93CX
Browse files Browse the repository at this point in the history 
this is basically a port of Larry Fingers Patch for rtl8187se to rtl8192su.
also removed some dead code.
plus cosmetics.

Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Florian Schilhabel authored and Greg Kroah-Hartman committed May 11, 2010
1 parent b4c84c2 commit e3133b2
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 233 deletions.
1 change: 1 addition & 0 deletions drivers/staging/rtl8192su/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ config RTL8192SU
depends on PCI && WLAN && USB
select WIRELESS_EXT
select WEXT_PRIV
select EEPROM_93CX6
default N
---help---
1 change: 0 additions & 1 deletion drivers/staging/rtl8192su/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ EXTRA_CFLAGS += -DTHOMAS_BEACON
#EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT

r8192s_usb-objs := \
r8180_93cx6.o \
r8192U_wx.o \
r8192S_phy.o \
r8192S_rtl6052.o \
Expand Down
146 changes: 0 additions & 146 deletions drivers/staging/rtl8192su/r8180_93cx6.c
View file

This file was deleted.

40 changes: 0 additions & 40 deletions drivers/staging/rtl8192su/r8180_93cx6.h
View file

This file was deleted.

6 changes: 6 additions & 0 deletions drivers/staging/rtl8192su/r8192U.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@

#include "r8192S_firmware.h"

/* EEPROM defs for use with linux/eeprom_93cx6.h */
#define RTL819X_EEPROM_CMD_READ (1 << 0)
#define RTL819X_EEPROM_CMD_WRITE (1 << 1)
#define RTL819X_EEPROM_CMD_CK (1 << 2)
#define RTL819X_EEPROM_CMD_CS (1 << 3)

//#define RTL8192U
#define RTL819xU_MODULE_NAME "rtl819xU"
//added for HW security, john.0629
Expand Down
113 changes: 67 additions & 46 deletions drivers/staging/rtl8192su/r8192U_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include <linux/vmalloc.h>
#include <linux/slab.h>
#include <linux/eeprom_93cx6.h>

#undef LOOP_TEST
#undef DUMP_RX
Expand Down Expand Up @@ -54,7 +55,6 @@

#include <asm/uaccess.h>
#include "r8192U.h"
#include "r8180_93cx6.h" /* Card EEPROM */
#include "r8192U_wx.h"

#include "r8192S_rtl8225.h"
Expand Down Expand Up @@ -214,6 +214,36 @@ static CHANNEL_LIST ChannelPlan[] = {
{{1,2,3,4,5,6,7,8,9,10,11,12,13,14},14} //For Global Domain. 1-11:active scan, 12-14 passive scan. //+YJ, 080626
};

static void rtl819x_eeprom_register_read(struct eeprom_93cx6 *eeprom)
{
struct net_device *dev = eeprom->data;
u8 reg = read_nic_byte(dev, EPROM_CMD);

eeprom->reg_data_in = reg & RTL819X_EEPROM_CMD_WRITE;
eeprom->reg_data_out = reg & RTL819X_EEPROM_CMD_READ;
eeprom->reg_data_clock = reg & RTL819X_EEPROM_CMD_CK;
eeprom->reg_chip_select = reg & RTL819X_EEPROM_CMD_CS;
}

static void rtl819x_eeprom_register_write(struct eeprom_93cx6 *eeprom)
{
struct net_device *dev = eeprom->data;
u8 reg = 2 << 6;

if (eeprom->reg_data_in)
reg |= RTL819X_EEPROM_CMD_WRITE;
if (eeprom->reg_data_out)
reg |= RTL819X_EEPROM_CMD_READ;
if (eeprom->reg_data_clock)
reg |= RTL819X_EEPROM_CMD_CK;
if (eeprom->reg_chip_select)
reg |= RTL819X_EEPROM_CMD_CS;

write_nic_byte(dev, EPROM_CMD, reg);
read_nic_byte(dev, EPROM_CMD);
udelay(10);
}

static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv* priv)
{
int i, max_chan=-1, min_chan=-1;
Expand Down Expand Up @@ -1152,15 +1182,6 @@ void tx_timeout(struct net_device *dev)
//DMESG("TXTIMEOUT");
}


/* this is only for debug */
void dump_eprom(struct net_device *dev)
{
int i;
for(i=0; i<63; i++)
RT_TRACE(COMP_EPROM, "EEPROM addr %x : %x", i, eprom_read(dev,i));
}

/* this is only for debug */
void rtl8192_dump_reg(struct net_device *dev)
{
Expand Down Expand Up @@ -3531,48 +3552,53 @@ rtl8192SU_ConfigAdapterInfo8192SForAutoLoadFail(struct net_device* dev)
//
// Created by Roger, 2008.10.21.
//
void
rtl8192SU_ReadAdapterInfo8192SUsb(struct net_device* dev)
void rtl8192SU_ReadAdapterInfo8192SUsb(struct net_device* dev)
{
struct r8192_priv *priv = ieee80211_priv(dev);
u16 i,usValue;
u8 tmpU1b, tempval;
u16 EEPROMId;
u8 hwinfo[HWSET_MAX_SIZE_92S];
u8 rf_path, index; // For EEPROM/EFUSE After V0.6_1117

struct r8192_priv *priv = ieee80211_priv(dev);
u16 i;
u8 tmpU1b, tempval;
u16 EEPROMId;
u8 hwinfo[HWSET_MAX_SIZE_92S];
u8 rf_path, index; // For EEPROM/EFUSE After V0.6_1117
struct eeprom_93cx6 eeprom;
u16 eeprom_val;

eeprom.data = dev;
eeprom.register_read = rtl819x_eeprom_register_read;
eeprom.register_write = rtl819x_eeprom_register_write;
if (priv->epromtype == EPROM_93c46)
eeprom.width = PCI_EEPROM_WIDTH_93C46;
else
eeprom.width = PCI_EEPROM_WIDTH_93C56;

RT_TRACE(COMP_INIT, "====> ReadAdapterInfo8192SUsb\n");

//
// <Roger_Note> The following operation are prevent Efuse leakage by turn on 2.5V.
// 2008.11.25.
//
/*
* The following operation are prevent Efuse leakage by turn on 2.5V..
*/
tmpU1b = read_nic_byte(dev, EFUSE_TEST+3);
write_nic_byte(dev, EFUSE_TEST+3, tmpU1b|0x80);
//PlatformStallExecution(1000);
mdelay(10);
write_nic_byte(dev, EFUSE_TEST+3, (tmpU1b&(~BIT7)));

// Retrieve Chip version.
priv->card_8192_version = (VERSION_8192S)((read_nic_dword(dev, PMC_FSM)>>16)&0xF);
RT_TRACE(COMP_INIT, "Chip Version ID: 0x%2x\n", priv->card_8192_version);

switch(priv->card_8192_version)
{
case 0:
RT_TRACE(COMP_INIT, "Chip Version ID: VERSION_8192S_ACUT.\n");
break;
case 1:
RT_TRACE(COMP_INIT, "Chip Version ID: VERSION_8192S_BCUT.\n");
break;
case 2:
RT_TRACE(COMP_INIT, "Chip Version ID: VERSION_8192S_CCUT.\n");
break;
default:
RT_TRACE(COMP_INIT, "Unknown Chip Version!!\n");
priv->card_8192_version = VERSION_8192S_BCUT;
break;
switch (priv->card_8192_version) {
case 0:
RT_TRACE(COMP_INIT, "Chip Version ID: VERSION_8192S_ACUT.\n");
break;
case 1:
RT_TRACE(COMP_INIT, "Chip Version ID: VERSION_8192S_BCUT.\n");
break;
case 2:
RT_TRACE(COMP_INIT, "Chip Version ID: VERSION_8192S_CCUT.\n");
break;
default:
RT_TRACE(COMP_INIT, "Unknown Chip Version!!\n");
priv->card_8192_version = VERSION_8192S_BCUT;
break;
}

//if (IS_BOOT_FROM_EEPROM(Adapter))
Expand All @@ -3585,8 +3611,8 @@ rtl8192SU_ReadAdapterInfo8192SUsb(struct net_device* dev)
// Read all Content from EEPROM or EFUSE.
for(i = 0; i < HWSET_MAX_SIZE_92S; i += 2)
{
usValue = eprom_read(dev, (u16) (i>>1));
*((u16*)(&hwinfo[i])) = usValue;
eeprom_93cx6_read(&eeprom, (u16) (i>>1), &eeprom_val);
*((u16 *)(&hwinfo[i])) = eeprom_val;
}
}
else if (!(priv->EepromOrEfuse))
Expand Down Expand Up @@ -4138,11 +4164,6 @@ short rtl8192_init(struct net_device *dev)
init_timer(&priv->watch_dog_timer);
priv->watch_dog_timer.data = (unsigned long)dev;
priv->watch_dog_timer.function = watch_dog_timer_callback;

//rtl8192_adapter_start(dev);
#ifdef DEBUG_EPROM
dump_eprom(dev);
#endif
return 0;
}

Expand Down

0 comments on commit e3133b2

Please sign in to comment.