redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: wlags49_h2: sta_h2: corrects C99 // comments

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

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Meiring 2012-11-30 18:58:45 +02:00 committed by Greg Kroah-Hartman
parent de199db35e
commit 61fc9c89b2
1 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
drivers/staging/wlags49_h2/sta_h2.c
View file

@ -25,10 +25,10 @@
*/ */
#include "hcfcfg.h" // to get hcf_16 etc defined as well as #include "hcfcfg.h" /* to get hcf_16 etc defined as well as */
// possible settings which influence mdd.h or dhf.h /* possible settings which influence mdd.h or dhf.h */
#include "mdd.h" // to get COMP_ID_STA etc defined #include "mdd.h" /* to get COMP_ID_STA etc defined */
#include "dhf.h" // used to be fhfmem.h, to get memblock,plugrecord, #include "dhf.h" /* used to be fhfmem.h, to get memblock,plugrecord, */
static const hcf_8 fw_image_1_data[] = { static const hcf_8 fw_image_1_data[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, sizeof(CFG_IDENTITY_STRCT) / sizeof(hcf_16) - 1,
CFG_FW_IDENTITY, CFG_FW_IDENTITY,
COMP_ID_FW_STA, COMP_ID_FW_STA,
3, //Variant 3, /* Variant */
2, //Major 2, /* Major */
36 //Minor 36 /* Minor */
}, },
{ 0000, 0000, 0000, 0000, 0000, 0000 } //endsentinel { 0000, 0000, 0000, 0000, 0000, 0000 } /* endsentinel */
}; };
static const CFG_PROG_STRCT fw_image_code[] = { static const CFG_PROG_STRCT fw_image_code[] = {
{ {
8, 8,
CFG_PROG, CFG_PROG,
CFG_PROG_VOLATILE, // mode CFG_PROG_VOLATILE, /* mode */
0x0186, // sizeof(fw_image_1_data), 0x0186, /* sizeof(fw_image_1_data), */
0x00000060, // Target address in NIC Memory 0x00000060, /* Target address in NIC Memory */
0x0000, // CRC: yes/no TYPE: primary/station/tertiary 0x0000, /* CRC: yes/no TYPE: primary/station/tertiary */
(hcf_8 *)fw_image_1_data (hcf_8 *)fw_image_1_data
}, },
{ {
8, 8,
CFG_PROG, CFG_PROG,
CFG_PROG_VOLATILE, // mode CFG_PROG_VOLATILE, /* mode */
0x2518, // sizeof(fw_image_2_data), 0x2518, /* sizeof(fw_image_2_data), */
0x00000C16, // Target address in NIC Memory 0x00000C16, /* Target address in NIC Memory */
0x0000, // CRC: yes/no TYPE: primary/station/tertiary 0x0000, /* CRC: yes/no TYPE: primary/station/tertiary */
(hcf_8 *)fw_image_2_data (hcf_8 *)fw_image_2_data
}, },
{ {
8, 8,
CFG_PROG, CFG_PROG,
CFG_PROG_VOLATILE, // mode CFG_PROG_VOLATILE, /* mode */
0x3daa, // sizeof(fw_image_3_data), 0x3daa, /* sizeof(fw_image_3_data), */
0x001E312E, // Target address in NIC Memory 0x001E312E, /* Target address in NIC Memory */
0x0000, // CRC: yes/no TYPE: primary/station/tertiary 0x0000, /* CRC: yes/no TYPE: primary/station/tertiary */
(hcf_8 *)fw_image_3_data (hcf_8 *)fw_image_3_data
}, },
{ {
8, 8,
CFG_PROG, CFG_PROG,
CFG_PROG_VOLATILE, // mode CFG_PROG_VOLATILE, /* mode */
0xaa66, // sizeof(fw_image_4_data), 0xaa66, /* sizeof(fw_image_4_data), */
0x001F4000, // Target address in NIC Memory 0x001F4000, /* Target address in NIC Memory */
0x0000, // CRC: yes/no TYPE: primary/station/tertiary 0x0000, /* CRC: yes/no TYPE: primary/station/tertiary */
(hcf_8 *)fw_image_4_data (hcf_8 *)fw_image_4_data
}, },
{ {
5, 5,
CFG_PROG, CFG_PROG,
CFG_PROG_STOP, // mode CFG_PROG_STOP, /* mode */
0000, 0000,
0x000F368E, // Start execution address 0x000F368E, /* Start execution address */
}, },
{ 0000, 0000, 0000, 0000, 00000000, 0000, 00000000} { 0000, 0000, 0000, 0000, 00000000, 0000, 00000000}
}; };
@ -4444,7 +4444,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_SUPL, COMP_ROLE_SUPL,
COMP_ID_STA, 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)), { 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_ROLE_ACT,
COMP_ID_MFI, COMP_ID_MFI,
{ {
{ 4, 6, 7 }, //variant, bottom, top { 4, 6, 7 }, /* variant, bottom, top */
{ 5, 6, 7 }, //variant, bottom, top { 5, 6, 7 }, /* variant, bottom, top */
{ 6, 6, 7 } //variant, bottom, top { 6, 6, 7 } /* variant, bottom, top */
} }
}, },
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)), { 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_ROLE_ACT,
COMP_ID_CFI, 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 = { 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, (CFG_PROG_STRCT *) fw_image_code,
0x000F368E, 0x000F368E,
00000000, //(dummy) pdaplug 00000000, /* (dummy) pdaplug */
00000000, //(dummy) priplug 00000000, /* (dummy) priplug */
(CFG_RANGE20_STRCT *) fw_image_infocompat, (CFG_RANGE20_STRCT *) fw_image_infocompat,
(CFG_IDENTITY_STRCT *) fw_image_infoidentity, (CFG_IDENTITY_STRCT *) fw_image_infoidentity,
}; };