// conf_tx: hal_set_cwmin()/hal_set_cwmax;
};
-static unsigned char wb35_hw_init(struct ieee80211_hw *hw)
+static int wb35_hw_init(struct ieee80211_hw *hw)
{
struct wbsoft_priv *priv = hw->priv;
struct hw_data * pHwData;
u8 *pMacAddr;
u8 *pMacAddr2;
- u32 InitStep = 0;
u8 EEPROM_region;
u8 HwRadioOff;
+ int err;
//
// Setting default value for Linux
priv->sLocalPara.WepKeyDetectTimerCount= 2 * 100; /// 2 seconds
// Initial USB hal
- InitStep = 1;
pHwData = &priv->sHwData;
- if (!hal_init_hardware(hw))
+ if (!hal_init_hardware(hw)) {
+ err = -EINVAL;
goto error;
+ }
EEPROM_region = hal_get_region_from_EEPROM( pHwData );
if (EEPROM_region != REGION_AUTO)
if (hal_software_set(pHwData) & 0x00000001)
priv->sLocalPara.boAntennaDiversity = true;
- //
- // For TS module
- //
- InitStep = 2;
-
// For MDS module
- InitStep = 3;
Mds_initial(priv);
//=======================================
// Initialize the SME, SCAN, MLME, ROAM
//=======================================
- InitStep = 4;
- InitStep = 5;
- InitStep = 6;
// If no user-defined address in the registry, use the addresss "burned" on the NIC instead.
pMacAddr = priv->sLocalPara.ThisMacAddress;
hal_driver_init_OK(pHwData) = 1; // Notify hal that the driver is ready now.
//set a tx power for reference.....
// sme_set_tx_power_level(priv, 12); FIXME?
- return true;
+ return 0;
error:
- switch (InitStep) {
- case 5:
- case 4:
- case 3: Mds_Destroy( priv );
- case 2:
- case 1: hal_halt( pHwData, NULL );
- case 0: break;
- }
+ hal_halt(pHwData, NULL);
- return false;
+ return err;
}
static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table)
pWbUsb->IsUsb20 = 1;
}
- if (!wb35_hw_init(dev)) {
- err = -EINVAL;
+ err = wb35_hw_init(dev);
+ if (err)
goto error_free_hw;
- }
SET_IEEE80211_DEV(dev, &udev->dev);
{