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

Commit 2d08748a authored by Stephen Hemminger's avatar Stephen Hemminger
Browse files

beceem: module initialization 



Get rid of boot messages and put in correct place.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
parent 4fd64dd0

drivers/staging/bcm/Bcmnet.c

+0 −22
Original line number Diff line number Diff line
@@ -241,25 +241,3 @@ int register_networkdev(PMINI_ADAPTER Adapter) 


	return result;

}
 


static int bcm_init(void)

{

	printk(KERN_INFO "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);

	printk(KERN_INFO "%s\n", DRV_COPYRIGHT);



	return InterfaceInitialize();

}





static void bcm_exit(void)

{

	InterfaceExit();

}



module_init(bcm_init);

module_exit(bcm_exit);



MODULE_DESCRIPTION(DRV_DESCRIPTION);

MODULE_VERSION(DRV_VERSION);

MODULE_LICENSE ("GPL");

drivers/staging/bcm/InterfaceInit.c

+41 −64
Original line number Diff line number Diff line
@@ -338,13 +338,11 @@ static int device_run(PS_INTERFACE_ADAPTER psIntfAdapter) 
	status = InitCardAndDownloadFirmware(psIntfAdapter->psAdapter);

	if(status != STATUS_SUCCESS)

	{

		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "InitCardAndDownloadFirmware failed.\n");

		pr_err(DRV_NAME "InitCardAndDownloadFirmware failed.\n");

		return status;

	}

	if(TRUE == psIntfAdapter->psAdapter->fw_download_done)

	{



		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Sending first interrupt URB down......");

		if(StartInterruptUrb(psIntfAdapter))

		{

			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Cannot send interrupt in URB");
@@ -357,16 +355,11 @@ static int device_run(PS_INTERFACE_ADAPTER psIntfAdapter) 
					psIntfAdapter->psAdapter->waiting_to_fw_download_done, 5*HZ);



		if(value == 0)

		{

			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"Mailbox Interrupt has not reached to Driver..");

		}

		else

		{

			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"Got the mailbox interrupt ...Registering control interface...\n ");

		}

			pr_err(DRV_NAME ": Mailbox Interrupt has not reached to Driver..\n");



		if(register_control_device_interface(psIntfAdapter->psAdapter) < 0)

		{

			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Register Control Device failed...");

			pr_err(DRV_NAME ": Register Control Device failed...\n");

			return -EIO;

		}

	}
@@ -460,20 +453,9 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter) 
	UINT uiData = 0;



	/* Store the usb dev into interface adapter */

	psIntfAdapter->udev = usb_get_dev(interface_to_usbdev(

								psIntfAdapter->interface));



	if((psIntfAdapter->udev->speed == USB_SPEED_HIGH))

	{

		psIntfAdapter->bHighSpeedDevice = TRUE ;

		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "MODEM IS CONFIGURED TO HIGH_SPEED ");

	}

	else

	{

		psIntfAdapter->bHighSpeedDevice = FALSE ;

		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "MODEM IS CONFIGURED TO FULL_SPEED ");

	}

	psIntfAdapter->udev = usb_get_dev(interface_to_usbdev(psIntfAdapter->interface));



	psIntfAdapter->bHighSpeedDevice = (psIntfAdapter->udev->speed == USB_SPEED_HIGH);

	psIntfAdapter->psAdapter->interface_rdm = BcmRDM;

	psIntfAdapter->psAdapter->interface_wrm = BcmWRM;
@@ -482,28 +464,27 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter) 
		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "CHIP ID Read Failed\n");

		return STATUS_FAILURE;

	}



	if(0xbece3200==(psIntfAdapter->psAdapter->chip_id&~(0xF0)))

	{

		psIntfAdapter->psAdapter->chip_id=(psIntfAdapter->psAdapter->chip_id&~(0xF0));

	}

		psIntfAdapter->psAdapter->chip_id &= ~0xF0;



	BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "First RDM Chip ID 0x%lx\n", psIntfAdapter->psAdapter->chip_id);

	dev_info(&psIntfAdapter->udev->dev, "RDM Chip ID 0x%lx\n",

		 psIntfAdapter->psAdapter->chip_id);



	iface_desc = psIntfAdapter->interface->cur_altsetting;

	//print_usb_interface_desc(&(iface_desc->desc));



	if(psIntfAdapter->psAdapter->chip_id == T3B)

	{



		//

		//T3B device will have EEPROM,check if EEPROM is proper and BCM16 can be done or not.

		//

		BeceemEEPROMBulkRead(psIntfAdapter->psAdapter,&uiData,0x0,4);

		if(uiData == BECM)

		{

			bBcm16 = TRUE;

		}

		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Number of Altsetting aviailable for This Modem 0x%x\n", psIntfAdapter->interface->num_altsetting);



		dev_info(&psIntfAdapter->udev->dev, "number of alternate setting %d\n",

			 psIntfAdapter->interface->num_altsetting);



		if(bBcm16 == TRUE)

		{

			//selecting alternate setting one as a default setting for High Speed  modem.
@@ -574,12 +555,10 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter) 
	}



	iface_desc = psIntfAdapter->interface->cur_altsetting;

	//print_usb_interface_desc(&(iface_desc->desc));

   	BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Current number of endpoints :%x \n", iface_desc->desc.bNumEndpoints);



	for (value = 0; value < iface_desc->desc.bNumEndpoints; ++value)

	{

		endpoint = &iface_desc->endpoint[value].desc;

		//print_usb_endpoint_descriptor(endpoint);



        if (!psIntfAdapter->sBulkIn.bulk_in_endpointAddr && bcm_usb_endpoint_is_bulk_in(endpoint))

        {
@@ -612,10 +591,10 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter) 
            psIntfAdapter->sIntrIn.int_in_buffer =

						kmalloc(buffer_size, GFP_KERNEL);

            if (!psIntfAdapter->sIntrIn.int_in_buffer) {

                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Could not allocate interrupt_in_buffer");

		    dev_err(&psIntfAdapter->udev->dev,

			    "could not allocate interrupt_in_buffer\n");

                return -EINVAL;

            }

			//psIntfAdapter->sIntrIn.int_in_pipe =

        }



        if (!psIntfAdapter->sIntrOut.int_out_endpointAddr && bcm_usb_endpoint_is_int_out(endpoint))
@@ -647,7 +626,8 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter) 
														GFP_KERNEL);

	            	if (!psIntfAdapter->sIntrOut.int_out_buffer)

			{

	                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Could not allocate interrupt_out_buffer");

				dev_err(&psIntfAdapter->udev->dev,

					"could not allocate interrupt_out_buffer\n");

					return -EINVAL;

			}

        }
@@ -681,8 +661,7 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter) 
static int InterfaceSuspend (struct usb_interface *intf, pm_message_t message)

{

	PS_INTERFACE_ADAPTER  psIntfAdapter = usb_get_intfdata(intf);

	BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "=================================\n");

	//Bcm_kill_all_URBs(psIntfAdapter);



	psIntfAdapter->bSuspended = TRUE;



	if(TRUE == psIntfAdapter->bPreparingForBusSuspend)
@@ -735,33 +714,31 @@ static struct usb_driver usbbcm_driver = { 


struct class *bcm_class;



/*

Function:				InterfaceInitialize



Description:			This is the hardware specific initialization Function.

						Registering the driver with NDIS , other device specific NDIS

						and hardware initializations are done here.



Input parameters:		IN PMINI_ADAPTER Adapter   - Miniport Adapter Context





Return:					BCM_STATUS_SUCCESS - If Initialization of the

						HW Interface was successful.

						Other           - If an error occured.

*/

INT InterfaceInitialize(void)

static __init int bcm_init(void)

{

	printk(KERN_INFO "%s: %s, %s\n", DRV_NAME, DRV_DESCRIPTION, DRV_VERSION);

	printk(KERN_INFO "%s\n", DRV_COPYRIGHT);



	bcm_class = class_create(THIS_MODULE, DRV_NAME);

	if (IS_ERR(bcm_class)) {

		printk(KERN_ERR DRV_NAME ": could not create class\n");

		return PTR_ERR(bcm_class);

	}



	return usb_register(&usbbcm_driver);

}



INT InterfaceExit(void)

static __exit void bcm_exit(void)

{

        class_destroy (bcm_class);



	usb_deregister(&usbbcm_driver);

	return 0;

}



module_init(bcm_init);

module_exit(bcm_exit);



MODULE_DESCRIPTION(DRV_DESCRIPTION);

MODULE_VERSION(DRV_VERSION);

MODULE_LICENSE ("GPL");

drivers/staging/bcm/InterfaceMisc.c

+1 −13
Original line number Diff line number Diff line
@@ -224,8 +224,6 @@ VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter) 
	}



	/* Cancel All submitted TX URB's */

	BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Cancelling All Submitted TX Urbs \n");



	for(i = 0; i < MAXIMUM_USB_TCB; i++)

	{

		tempUrb = psIntfAdapter->asUsbTcb[i].urb;
@@ -236,9 +234,6 @@ VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter) 
		}

	}





    BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "Cancelling All submitted Rx Urbs \n");



	for(i = 0; i < MAXIMUM_USB_RCB; i++)

	{

		tempUrb = psIntfAdapter->asUsbRcb[i].urb;
@@ -249,16 +244,11 @@ VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter) 
		}

	}





	atomic_set(&psIntfAdapter->uNumTcbUsed, 0);

	atomic_set(&psIntfAdapter->uCurrTcb, 0);



	atomic_set(&psIntfAdapter->uNumRcbUsed, 0);

	atomic_set(&psIntfAdapter->uCurrRcb, 0);



	BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "TCB: used- %d cur-%d\n", atomic_read(&psIntfAdapter->uNumTcbUsed), atomic_read(&psIntfAdapter->uCurrTcb));

	BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, "RCB: used- %d cur-%d\n", atomic_read(&psIntfAdapter->uNumRcbUsed), atomic_read(&psIntfAdapter->uCurrRcb));



}



VOID putUsbSuspend(struct work_struct *work)
@@ -270,8 +260,6 @@ VOID putUsbSuspend(struct work_struct *work) 


	if(psIntfAdapter->bSuspended == FALSE)

		usb_autopm_put_interface(intf);

	else

		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Interface Resumed Completely\n");



}

drivers/staging/bcm/Misc.c

+33 −53
Original line number Diff line number Diff line
@@ -152,34 +152,30 @@ VOID AdapterFree(PMINI_ADAPTER Adapter) 
	free_netdev(Adapter->dev);

}





int create_worker_threads(PMINI_ADAPTER psAdapter)

static int create_worker_threads(PMINI_ADAPTER psAdapter)

{

	const char *name = psAdapter->dev->name;



	BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Init Threads...");

	// Rx Control Packets Processing

	psAdapter->control_packet_handler = kthread_run((int (*)(void *))

							control_packet_handler, psAdapter, "%s-rx", name);

							control_packet_handler, psAdapter, "%s-rx", DRV_NAME);

	if(IS_ERR(psAdapter->control_packet_handler))

	{

		BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "No Kernel Thread, but still returning success\n");

		pr_notice(DRV_NAME ": could not create control thread\n");

		return PTR_ERR(psAdapter->control_packet_handler);

	}



	// Tx Thread

	psAdapter->transmit_packet_thread = kthread_run((int (*)(void *))

							tx_pkt_handler, psAdapter, "%s-tx", name);

							tx_pkt_handler, psAdapter, "%s-tx", DRV_NAME);

	if(IS_ERR (psAdapter->transmit_packet_thread))

	{

		BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "No Kernel Thread, but still returning success");

		pr_notice(DRV_NAME ": could not creat transmit thread\n");

		kthread_stop(psAdapter->control_packet_handler);

		return PTR_ERR(psAdapter->transmit_packet_thread);

	}

	return 0;

}





static inline struct file *open_firmware_file(PMINI_ADAPTER Adapter, char *path)

static struct file *open_firmware_file(PMINI_ADAPTER Adapter, char *path)

{

    struct file             *flp=NULL;

    mm_segment_t        oldfs;
@@ -189,19 +185,13 @@ static inline struct file *open_firmware_file(PMINI_ADAPTER Adapter, char *path) 
    set_fs(oldfs);

    if(IS_ERR(flp))

    {

        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Unable To Open File %s, err  %lx",

	    pr_err(DRV_NAME "Unable To Open File %s, err %ld",

		   path, PTR_ERR(flp));

	    flp = NULL;

    }

    else

    {

        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Got file descriptor pointer of %s!",

			path);

    }



    if(Adapter->device_removed)

	{

	    flp = NULL;

	}



    return flp;

}
@@ -254,9 +244,7 @@ int BcmFileDownload(PMINI_ADAPTER Adapter,/**< Logical Adapter */ 
	if(flp && !(IS_ERR(flp)))

    	filp_close(flp, current->files);

    set_fs(oldfs);

    do_gettimeofday(&tv);

    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "file download done at %lx", ((tv.tv_sec * 1000) +

                            (tv.tv_usec/1000)));



    return errorno;

}
@@ -1104,11 +1092,10 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter) 
 	 * Firm/DDR Settings..

 	 */



	if((status = create_worker_threads(ps_adapter))<0)

	{

		BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Cannot create thread");

	status = create_worker_threads(ps_adapter);

	if (status<0)

		return status;

	}



	/*

 	 * For Downloading the Firm, parse the cfg file first.

 	 */
@@ -1134,7 +1121,7 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter) 
	status = ddr_init(ps_adapter);

	if(status)

	{

		BCM_DEBUG_PRINT (ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "ddr_init Failed\n");

		pr_err(DRV_NAME "ddr_init Failed\n");

		return status;

	}
@@ -1148,7 +1135,6 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter) 
		BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Error downloading CFG file");

		goto OUT;

	}

	BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "CFG file downloaded");



	if(register_networkdev(ps_adapter))

	{
@@ -1221,7 +1207,6 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter) 
		goto OUT;

	}



	BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "BIN file downloaded");

	status = run_card_proc(ps_adapter);

	if(status)

	{
@@ -1302,22 +1287,23 @@ void beceem_parse_target_struct(PMINI_ADAPTER Adapter) 


	if(ntohl(Adapter->pstargetparams->m_u32PhyParameter2) & AUTO_SYNC_DISABLE)

	{

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "AutoSyncup is Disabled\n");

		pr_info(DRV_NAME ": AutoSyncup is Disabled\n");

		Adapter->AutoSyncup = FALSE;

	}

	else

	{

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "AutoSyncup is Enabled\n");

		pr_info(DRV_NAME ": AutoSyncup is Enabled\n");

		Adapter->AutoSyncup	= TRUE;

	}



	if(ntohl(Adapter->pstargetparams->HostDrvrConfig6) & AUTO_LINKUP_ENABLE)

	{

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Enabling autolink up");

		pr_info(DRV_NAME ": Enabling autolink up");

		Adapter->AutoLinkUp = TRUE;

	}

	else

	{

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Disabling autolink up");

		pr_info(DRV_NAME ": Disabling autolink up");

		Adapter->AutoLinkUp = FALSE;

	}

	// Setting the DDR Setting..
@@ -1326,51 +1312,46 @@ void beceem_parse_target_struct(PMINI_ADAPTER Adapter) 
	Adapter->ulPowerSaveMode =

			(ntohl(Adapter->pstargetparams->HostDrvrConfig6)>>12)&0x0F;



	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "DDR Setting: %x\n", Adapter->DDRSetting);

	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT,DBG_LVL_ALL, "Power Save Mode: %lx\n",

							Adapter->ulPowerSaveMode);

	pr_info(DRV_NAME ": DDR Setting: %x\n", Adapter->DDRSetting);

	pr_info(DRV_NAME ": Power Save Mode: %lx\n", Adapter->ulPowerSaveMode);

	if(ntohl(Adapter->pstargetparams->HostDrvrConfig6) & AUTO_FIRM_DOWNLOAD)

    {

        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Enabling Auto Firmware Download\n");

        pr_info(DRV_NAME ": Enabling Auto Firmware Download\n");

        Adapter->AutoFirmDld = TRUE;

    }

    else

    {

        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Disabling Auto Firmware Download\n");

        pr_info(DRV_NAME ": Disabling Auto Firmware Download\n");

        Adapter->AutoFirmDld = FALSE;

    }

	uiHostDrvrCfg6 = ntohl(Adapter->pstargetparams->HostDrvrConfig6);

	Adapter->bMipsConfig = (uiHostDrvrCfg6>>20)&0x01;

	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL,"MIPSConfig   : 0x%X\n",Adapter->bMipsConfig);

	pr_info(DRV_NAME ": MIPSConfig   : 0x%X\n",Adapter->bMipsConfig);

	//used for backward compatibility.

	Adapter->bDPLLConfig = (uiHostDrvrCfg6>>19)&0x01;



	Adapter->PmuMode= (uiHostDrvrCfg6 >> 24 ) & 0x03;

	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "PMU MODE: %x", Adapter->PmuMode);

	pr_info(DRV_NAME ": PMU MODE: %x", Adapter->PmuMode);



    if((uiHostDrvrCfg6 >> HOST_BUS_SUSPEND_BIT ) & (0x01))

    {

        Adapter->bDoSuspend = TRUE;

        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Making DoSuspend TRUE as per configFile");

        pr_info(DRV_NAME ": Making DoSuspend TRUE as per configFile");

    }



	uiEEPROMFlag = ntohl(Adapter->pstargetparams->m_u32EEPROMFlag);

	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "uiEEPROMFlag  : 0x%X\n",uiEEPROMFlag);

	pr_info(DRV_NAME ": uiEEPROMFlag  : 0x%X\n",uiEEPROMFlag);

	Adapter->eNVMType = (NVM_TYPE)((uiEEPROMFlag>>4)&0x3);





	Adapter->bStatusWrite = (uiEEPROMFlag>>6)&0x1;

	//printk(("bStatusWrite   : 0x%X\n", Adapter->bStatusWrite));



	Adapter->uiSectorSizeInCFG = 1024*(0xFFFF & ntohl(Adapter->pstargetparams->HostDrvrConfig4));

	//printk(("uiSectorSize   : 0x%X\n", Adapter->uiSectorSizeInCFG));



	Adapter->bSectorSizeOverride =(bool) ((ntohl(Adapter->pstargetparams->HostDrvrConfig4))>>16)&0x1;

	//printk(MP_INIT,("bSectorSizeOverride   : 0x%X\n",Adapter->bSectorSizeOverride));



	if(ntohl(Adapter->pstargetparams->m_u32PowerSavingModeOptions) &0x01)

		Adapter->ulPowerSaveMode = DEVICE_POWERSAVE_MODE_AS_PROTOCOL_IDLE_MODE;

	//autocorrection part



	if(Adapter->ulPowerSaveMode != DEVICE_POWERSAVE_MODE_AS_PROTOCOL_IDLE_MODE)

		doPowerAutoCorrection(Adapter);
@@ -1378,7 +1359,7 @@ void beceem_parse_target_struct(PMINI_ADAPTER Adapter) 


VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter)

{

	UINT reporting_mode = 0;

	UINT reporting_mode;



	reporting_mode = ntohl(psAdapter->pstargetparams->m_u32PowerSavingModeOptions) &0x02 ;

	psAdapter->bIsAutoCorrectEnabled = !((char)(psAdapter->ulPowerSaveMode >> 3) & 0x1);
@@ -1395,7 +1376,6 @@ VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter) 
		{

			psAdapter->ulPowerSaveMode = DEVICE_POWERSAVE_MODE_AS_PMU_CLOCK_GATING;

			psAdapter->bDoSuspend =FALSE;

			BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL,"PMC selected..");



		}

drivers/staging/bcm/Prototypes.h

+0 −2
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ VOID AdapterFree(PMINI_ADAPTER Adapter); 


INT FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter);



int create_worker_threads(PMINI_ADAPTER psAdapter);



int tx_pkt_handler(PMINI_ADAPTER Adapter);



int  reset_card_proc(PMINI_ADAPTER Adapter );