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

Commit 4f55b5d4 authored by Johan Meiring's avatar Johan Meiring Committed by Greg Kroah-Hartman
Browse files

staging: wlags49_h2: ap_h25: corrects incorrect use of // 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 524cb2e5

drivers/staging/wlags49_h2/ap_h25.c

+34 −34
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ 
 */





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

				// possible settings which inluence 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 inluence 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,
@@ -3999,56 +3999,56 @@ static const CFG_IDENTITY_STRCT fw_image_infoidentity[] = { 
		sizeof(CFG_IDENTITY_STRCT) / sizeof(hcf_16) - 1,

		CFG_FW_IDENTITY,

		COMP_ID_FW_AP,

		3,							//Variant

		1,							//Major

		24							//Minor

		3,	/* Variant */

		1,	/* Major */

		24	/* 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

		0x0148,		// sizeof(fw_image_1_data),

		0x00000060,					// Target address in NIC Memory

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

		CFG_PROG_VOLATILE,	/* mode */

		0x0148,			/* 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

		0x2432,		// sizeof(fw_image_2_data),

		0x00000C16,					// Target address in NIC Memory

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

		CFG_PROG_VOLATILE,	/* mode */

		0x2432,			/* 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

		0x194c,		// sizeof(fw_image_3_data),

		0x001E3048,					// Target address in NIC Memory

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

		CFG_PROG_VOLATILE,	/*  mode */

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

		0x001E3048,		/*  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

		0xb7e4,		// sizeof(fw_image_4_data),

		0x001F4000,					// Target address in NIC Memory

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

		CFG_PROG_VOLATILE,	/* mode*/

		0xb7e4,			/* 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,

	0x000F2101,					// Start execution address

		0x000F2101,		/* Start execution address*/

	},

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

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

		COMP_ID_APF,

		{

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

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

		}

	},

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

		COMP_ID_MFI,

		{

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

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

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

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

		}

	},

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

		COMP_ID_CFI,

		{

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

			{ 4, 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,

	0x000F2101,

	00000000,					//(dummy) pdaplug

	00000000,					//(dummy) priplug

	00000000,				/* (dummy) pdaplug */

	00000000,				/* (dummy) priplug */

	(CFG_RANGE20_STRCT *) fw_image_infocompat,

	(CFG_IDENTITY_STRCT *) fw_image_infoidentity,

};