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

Commit 61fc9c89 authored by Johan Meiring's avatar Johan Meiring Committed by Greg Kroah-Hartman
Browse files

staging: wlags49_h2: sta_h2: corrects C99 // comments 



This commit converts C99 // comments to /* */

Signed-off-by: default avatarJohan Meiring <johanmeiring@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent de199db3

drivers/staging/wlags49_h2/sta_h2.c

+35 −35
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ 
 */





#include "hcfcfg.h"	// to get hcf_16 etc defined as well as

			// possible settings which influence mdd.h or dhf.h

#include "mdd.h"	// to get COMP_ID_STA etc defined

#include "dhf.h"	// used to be fhfmem.h, to get memblock,plugrecord,

#include "hcfcfg.h"	/* to get hcf_16 etc defined as well as */

			/* possible settings which influence mdd.h or dhf.h */

#include "mdd.h"	/* to get COMP_ID_STA etc defined */

#include "dhf.h"	/* used to be fhfmem.h, to get memblock,plugrecord, */



static const hcf_8 fw_image_1_data[] = {

	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4384,56 +4384,56 @@ static const CFG_IDENTITY_STRCT fw_image_infoidentity[] = { 
		sizeof(CFG_IDENTITY_STRCT) / sizeof(hcf_16) - 1,

		CFG_FW_IDENTITY,

		COMP_ID_FW_STA,

		3,							//Variant

		2,							//Major

		36							//Minor

		3,			/* Variant */

		2,			/* Major */

		36			/* Minor */

	},

	{ 0000, 0000, 0000, 0000, 0000, 0000 }		//endsentinel

	{ 0000, 0000, 0000, 0000, 0000, 0000 }	/* endsentinel */

};



static const CFG_PROG_STRCT fw_image_code[] = {

	{

		8,

		CFG_PROG,

		CFG_PROG_VOLATILE,			// mode

		0x0186,		// sizeof(fw_image_1_data),

		0x00000060,					// Target address in NIC Memory

		0x0000,						// CRC: yes/no	TYPE: primary/station/tertiary

		CFG_PROG_VOLATILE,	/* mode */

		0x0186,			/* sizeof(fw_image_1_data), */

		0x00000060,		/* Target address in NIC Memory */

		0x0000,			/* CRC: yes/no	TYPE: primary/station/tertiary */

		(hcf_8 *)fw_image_1_data

	},

	{

		8,

		CFG_PROG,

		CFG_PROG_VOLATILE,			// mode

		0x2518,		// sizeof(fw_image_2_data),

		0x00000C16,					// Target address in NIC Memory

		0x0000,						// CRC: yes/no	TYPE: primary/station/tertiary

		CFG_PROG_VOLATILE,	/* mode */

		0x2518,			/* sizeof(fw_image_2_data), */

		0x00000C16,		/* Target address in NIC Memory */

		0x0000,			/* CRC: yes/no	TYPE: primary/station/tertiary */

		(hcf_8 *)fw_image_2_data

	},

	{

		8,

		CFG_PROG,

		CFG_PROG_VOLATILE,			// mode

		0x3daa,		// sizeof(fw_image_3_data),

		0x001E312E,					// Target address in NIC Memory

		0x0000,						// CRC: yes/no	TYPE: primary/station/tertiary

		CFG_PROG_VOLATILE,	/* mode */

		0x3daa,			/* sizeof(fw_image_3_data), */

		0x001E312E,		/* Target address in NIC Memory */

		0x0000,			/* CRC: yes/no	TYPE: primary/station/tertiary */

		(hcf_8 *)fw_image_3_data

	},

	{

		8,

		CFG_PROG,

		CFG_PROG_VOLATILE,			// mode

		0xaa66,		// sizeof(fw_image_4_data),

		0x001F4000,					// Target address in NIC Memory

		0x0000,						// CRC: yes/no	TYPE: primary/station/tertiary

		CFG_PROG_VOLATILE,	/* mode */

		0xaa66,			/* sizeof(fw_image_4_data), */

		0x001F4000,		/* Target address in NIC Memory */

		0x0000,			/* CRC: yes/no	TYPE: primary/station/tertiary */

		(hcf_8 *)fw_image_4_data

	},

	{

		5,

		CFG_PROG,

		CFG_PROG_STOP,				// mode

		CFG_PROG_STOP,		/* mode */

		0000,

	0x000F368E,		// Start execution address

	0x000F368E,	/* Start execution address */

	},

	{ 0000, 0000, 0000, 0000, 00000000, 0000, 00000000}

};
@@ -4444,7 +4444,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = { 
		COMP_ROLE_SUPL,

		COMP_ID_STA,

		{

			{ 2, 2, 5 }				//variant, bottom, top

			{ 2, 2, 5 }	/* variant, bottom, top */

		}

	},

	{	3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -4452,9 +4452,9 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = { 
		COMP_ROLE_ACT,

		COMP_ID_MFI,

		{

			{ 4, 6, 7 },				//variant, bottom, top

			{ 5, 6, 7 },				//variant, bottom, top

			{ 6, 6, 7 }				//variant, bottom, top

			{ 4, 6, 7 },	/* variant, bottom, top */

			{ 5, 6, 7 },	/* variant, bottom, top */

			{ 6, 6, 7 }	/* variant, bottom, top */

		}

	},

	{	3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -4462,18 +4462,18 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = { 
		COMP_ROLE_ACT,

		COMP_ID_CFI,

		{

			{ 2, 1, 2 }				//variant, bottom, top

			{ 2, 1, 2 }	/* variant, bottom, top */

		}

	},

	{ 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } }	//endsentinel

	{ 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } }	/* endsentinel */

};



memimage fw_image = {

	"FUPU7D37dhfwci\001C",			//signature, <format number>, C/Bin type

	"FUPU7D37dhfwci\001C",			/* signature, <format number>, C/Bin type */

	(CFG_PROG_STRCT *) fw_image_code,

	0x000F368E,

	00000000,					//(dummy) pdaplug

	00000000,					//(dummy) priplug

	00000000,					/* (dummy) pdaplug */

	00000000,					/* (dummy) priplug */

	(CFG_RANGE20_STRCT *) fw_image_infocompat,

	(CFG_IDENTITY_STRCT *) fw_image_infoidentity,

};