lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] libertas: remove if_bootcmd.c

Browse Source 
Move the only function in it to if_usb.c, which was its
only user anyway.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Dan Williams
2007-08-02 11:14:49 -04:00
committed by David S. Miller
parent 1e838bf31c
commit 9e22cb67d9
4 changed files with 24 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/libertas/Makefile
View File

@@ -5,7 +5,6 @@ libertas-objs := main.o fw.o wext.o \
debugfs.o \ debugfs.o \
ethtool.o assoc.o ethtool.o assoc.o
usb8xxx-objs += if_bootcmd.o
usb8xxx-objs += if_usb.o usb8xxx-objs += if_usb.o
obj-$(CONFIG_LIBERTAS) += libertas.o obj-$(CONFIG_LIBERTAS) += libertas.o

40
drivers/net/wireless/libertas/if_bootcmd.c
View File

@@ -1,40 +0,0 @@
/**
* This file contains functions used in USB Boot command
* and Boot2/FW update
*/
#include <linux/delay.h>
#include <linux/firmware.h>
#include <linux/netdevice.h>
#include <linux/usb.h>
#define DRV_NAME "usb8xxx"
#include "defs.h"
#include "dev.h"
#include "if_usb.h"
/**
* @brief This function issues Boot command to the Boot2 code
* @param ivalue 1:Boot from FW by USB-Download
* 2:Boot from FW in EEPROM
* @return 0
*/
int if_usb_issue_boot_command(wlan_private *priv, int ivalue)
{
struct usb_card_rec *cardp = priv->card;
struct bootcmdstr sbootcmd;
int i;
/* Prepare command */
sbootcmd.u32magicnumber = cpu_to_le32(BOOT_CMD_MAGIC_NUMBER);
sbootcmd.u8cmd_tag = ivalue;
for (i=0; i<11; i++)
sbootcmd.au8dumy[i]=0x00;
memcpy(cardp->bulk_out_buffer, &sbootcmd, sizeof(struct bootcmdstr));
/* Issue command */
usb_tx_block(priv, cardp->bulk_out_buffer, sizeof(struct bootcmdstr));
return 0;
}

24
drivers/net/wireless/libertas/if_usb.c
View File

@@ -803,6 +803,30 @@ static int if_usb_register_dev(wlan_private * priv)
return 0; return 0;
} }
/**
* @brief This function issues Boot command to the Boot2 code
* @param ivalue 1:Boot from FW by USB-Download
* 2:Boot from FW in EEPROM
* @return 0
*/
static int if_usb_issue_boot_command(wlan_private *priv, int ivalue)
{
struct usb_card_rec *cardp = priv->card;
struct bootcmdstr sbootcmd;
int i;
/* Prepare command */
sbootcmd.u32magicnumber = cpu_to_le32(BOOT_CMD_MAGIC_NUMBER);
sbootcmd.u8cmd_tag = ivalue;
for (i=0; i<11; i++)
sbootcmd.au8dumy[i]=0x00;
memcpy(cardp->bulk_out_buffer, &sbootcmd, sizeof(struct bootcmdstr));
/* Issue command */
usb_tx_block(priv, cardp->bulk_out_buffer, sizeof(struct bootcmdstr));
return 0;
}
static int if_usb_prog_firmware(wlan_private * priv) static int if_usb_prog_firmware(wlan_private * priv)

1
drivers/net/wireless/libertas/if_usb.h
View File

@@ -104,6 +104,5 @@ struct fwsyncheader {
int usb_tx_block(wlan_private *priv, u8 *payload, u16 nb); int usb_tx_block(wlan_private *priv, u8 *payload, u16 nb);
void if_usb_free(struct usb_card_rec *cardp); void if_usb_free(struct usb_card_rec *cardp);
int if_usb_issue_boot_command(wlan_private *priv, int ivalue);
#endif #endif