Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197095
b: refs/heads/master
c: 1ef6118
h: refs/heads/master
i:
  197093: eda5f62
  197091: 8df45ba
  197087: dc3a795
v: v3
  • Loading branch information
Ruslan Pisarev authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 0f3e733 commit 0e8aba2
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7adea182f1fcaac3c0f37007a15d27f80ef56b85
refs/heads/master: 1ef61183ceaf2ebb59df817834c0cc755d99c634
38 changes: 19 additions & 19 deletions trunk/drivers/staging/wlags49_h2/dhf.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

// vim:tw=110:ts=4:
/* vim:tw=110:ts=4: */
#ifndef DHF_H
#define DHF_H

Expand Down Expand Up @@ -82,7 +82,7 @@
#include <windef.h>
#endif

#include "hcf.h" // includes HCFCFG.H too
#include "hcf.h" /* includes HCFCFG.H too */

#ifdef DHF_UIL
#define GET_INFO(pp) uil_get_info((LTVP)pp)
Expand All @@ -94,15 +94,15 @@


/*---- Defines --------------------------------------------------------------*/
#define CODEMASK 0x0000FFFFL // Codemask for plug records
#define CODEMASK 0x0000FFFFL /* Codemask for plug records */

/*---- Error numbers --------------------------------------------------------*/

#define DHF_ERR_INCOMP_FW 0x40 //Image not compatible with NIC
#define DHF_ERR_INCOMP_FW 0x40 /* Image not compatible with NIC */

/*---- Type definitions -----------------------------------------------------*/
//* needed by dhf_wrap.c
//
/* needed by dhf_wrap.c */

typedef struct {
LTVP ltvp;
hcf_16 len;
Expand All @@ -119,9 +119,9 @@ typedef struct {
*/

typedef struct {
hcf_32 code; // Code to plug
hcf_32 addr; // Address within the memory image to plug it in
hcf_32 len; // The # of bytes which are available to store it
hcf_32 code; /* Code to plug */
hcf_32 addr; /* Address within the memory image to plug it in */
hcf_32 len; /* The # of bytes which are available to store it */
} plugrecord;

/*
Expand Down Expand Up @@ -159,7 +159,7 @@ typedef struct {
char str[MAX_DEBUGEXPORT_LEN];
} exportrecord;

// Offsets in memimage array p[]
/* Offsets in memimage array p[] */
#define FWSTRINGS_FUNCTION 0
#define FWEXPORTS_FUNCTION 1

Expand Down Expand Up @@ -188,13 +188,13 @@ typedef struct {
* The end of the array is indicated by a plug record of which all fields are zero.
*/
typedef struct {
char signature[14+1+1]; // signature (see DHF.C) + C/LE-Bin/BE-Bin-flag + format version
CFG_PROG_STRCT FAR * codep; //
hcf_32 execution; // Execution address of the firmware
void FAR * place_holder_1;
char signature[14+1+1]; /* signature (see DHF.C) + C/LE-Bin/BE-Bin-flag + format version */
CFG_PROG_STRCT FAR *codep; /* */
hcf_32 execution; /* Execution address of the firmware */
void FAR *place_holder_1;
void FAR *place_holder_2;
CFG_RANGE20_STRCT FAR *compat; // Pointer to the compatibility info records
CFG_IDENTITY_STRCT FAR *identity; // Pointer to the identity info records
CFG_RANGE20_STRCT FAR *compat; /* Pointer to the compatibility info records */
CFG_IDENTITY_STRCT FAR *identity; /* Pointer to the identity info records */
void FAR *p[2]; /* (Up to 9) pointers for (future) expansion
* currently in use:
* - F/W printf information
Expand All @@ -209,7 +209,7 @@ typedef struct {
*
*---------------------------------------------------------------------------*/

EXTERN_C int dhf_download_fw(void *ifbp, memimage *fw); // ifbp, ignored when using the UIL
EXTERN_C int dhf_download_fw(void *ifbp, memimage *fw); /* ifbp, ignored when using the UIL */
EXTERN_C int dhf_download_binary(memimage *fw);


Expand All @@ -219,8 +219,8 @@ EXTERN_C int dhf_download_binary(memimage *fw);
*
*---------------------------------------------------------------------------*/

// defined in DHF.C; see there for comments
/* defined in DHF.C; see there for comments */
EXTERN_C hcf_16 *find_record_in_pda(hcf_16 *pdap, hcf_16 code);

#endif // DHF_H
#endif /* DHF_H */

0 comments on commit 0e8aba2

Please sign in to comment.