From: Ondrej Zary <linux@rainbow-software.org>
To: "Greg Kroah-Hartman" <greg@kroah.com>
Cc: Marek Belisko <marek.belisko@gmail.com>,
Kernel development list <linux-kernel@vger.kernel.org>
Subject: [PATCH 05/28] staging: ft1000-pcmcia: remove PSEUDO_HDR typedefs
Date: Fri, 1 Jul 2011 00:03:34 +0200 [thread overview]
Message-ID: <1309471437-12633-6-git-send-email-linux@rainbow-software.org> (raw)
In-Reply-To: <1309471437-12633-1-git-send-email-linux@rainbow-software.org>
Remove PSEUDO_HDR typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
---
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 14 +++++++-------
drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 16 ++++++++--------
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 14 +++++++-------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
index fab92ad..ca73aa4 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
@@ -42,7 +42,7 @@
#define CALDATESZ 6
// Pseudo Header structure
-typedef struct _PSEUDO_HDR
+struct pseudo_hdr
{
unsigned short length; // length of msg body
unsigned char source; // hardware source id
@@ -65,7 +65,7 @@ typedef struct _PSEUDO_HDR
unsigned char rsvd2;
unsigned short qos_class; // not used
unsigned short checksum; // pseudo header checksum
-} __attribute__ ((packed)) PSEUDO_HDR, *PPSEUDO_HDR;
+} __attribute__ ((packed));
// Definitions to maintain compatibility between other platforms
#define UCHAR u8
@@ -286,14 +286,14 @@ typedef struct _PSEUDO_HDR
#define MAXIMUM_ASIC_HB_CNT 15
typedef struct _DRVMSG {
- PSEUDO_HDR pseudo;
+ struct pseudo_hdr pseudo;
u16 type;
u16 length;
u8 data[0];
} __attribute__ ((packed)) DRVMSG, *PDRVMSG;
typedef struct _MEDIAMSG {
- PSEUDO_HDR pseudo;
+ struct pseudo_hdr pseudo;
u16 type;
u16 length;
u16 state;
@@ -305,14 +305,14 @@ typedef struct _MEDIAMSG {
} __attribute__ ((packed)) MEDIAMSG, *PMEDIAMSG;
typedef struct _TIMEMSG {
- PSEUDO_HDR pseudo;
+ struct pseudo_hdr pseudo;
u16 type;
u16 length;
u8 timeval[8];
} __attribute__ ((packed)) TIMEMSG, *PTIMEMSG;
typedef struct _DSPINITMSG {
- PSEUDO_HDR pseudo;
+ struct pseudo_hdr pseudo;
u16 type;
u16 length;
u8 DspVer[DSPVERSZ]; // DSP version number
@@ -325,7 +325,7 @@ typedef struct _DSPINITMSG {
} __attribute__ ((packed)) DSPINITMSG, *PDSPINITMSG;
typedef struct _DSPHIBERNATE {
- PSEUDO_HDR pseudo;
+ struct pseudo_hdr pseudo;
u16 type;
u16 length;
u32 timeout;
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
index c49180a..5633c40 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
@@ -91,7 +91,7 @@ void put_handshake(struct net_device *dev, USHORT handshake_value);
USHORT get_request_type(struct net_device *dev);
long get_request_value(struct net_device *dev);
void put_request_value(struct net_device *dev, long lvalue);
-USHORT hdr_checksum(PPSEUDO_HDR pHdr);
+USHORT hdr_checksum(struct pseudo_hdr *pHdr);
typedef struct _DSP_FILE_HDR {
u32 build_date;
@@ -297,7 +297,7 @@ void put_request_value(struct net_device *dev, long lvalue)
}
-USHORT hdr_checksum(PPSEUDO_HDR pHdr)
+USHORT hdr_checksum(struct pseudo_hdr *pHdr)
{
USHORT *usPtr = (USHORT *) pHdr;
USHORT chksum;
@@ -315,7 +315,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
USHORT DspWordCnt = 0;
UINT uiState;
USHORT handshake;
- PPSEUDO_HDR pHdr;
+ struct pseudo_hdr *pHdr;
USHORT usHdrLength;
PDSP_FILE_HDR pFileHdr;
long word_length;
@@ -851,7 +851,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
break;
}
- pHdr = (PPSEUDO_HDR) pUsFile;
+ pHdr = (struct pseudo_hdr *) pUsFile;
if (pHdr->portdest == 0x80 /* DspOAM */
&& (pHdr->portsrc == 0x00 /* Driver */
@@ -871,7 +871,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
case STATE_SECTION_PROV:
- pHdr = (PPSEUDO_HDR) pUcFile;
+ pHdr = (struct pseudo_hdr *) pUcFile;
if (pHdr->checksum == hdr_checksum(pHdr)) {
if (pHdr->portdest != 0x80 /* Dsp OAM */ ) {
@@ -882,12 +882,12 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
// Get buffer for provisioning data
pbuffer =
- kmalloc((usHdrLength + sizeof(PSEUDO_HDR)),
+ kmalloc((usHdrLength + sizeof(struct pseudo_hdr)),
GFP_ATOMIC);
if (pbuffer) {
memcpy(pbuffer, (void *)pUcFile,
(UINT) (usHdrLength +
- sizeof(PSEUDO_HDR)));
+ sizeof(struct pseudo_hdr)));
// link provisioning data
pprov_record =
kmalloc(sizeof(PROV_RECORD),
@@ -901,7 +901,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
// Move to next entry if available
pUcFile =
(UCHAR *) ((unsigned long) pUcFile +
- (unsigned long) ((usHdrLength + 1) & 0xFFFFFFFE) + sizeof(PSEUDO_HDR));
+ (unsigned long) ((usHdrLength + 1) & 0xFFFFFFFE) + sizeof(struct pseudo_hdr));
if ((unsigned long) (pUcFile) -
(unsigned long) (pFileStart) >=
(unsigned long) FileLength) {
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index d60ec7c..5f610e5 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -1021,7 +1021,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
u16 len;
u16 i;
PPROV_RECORD ptr;
- PPSEUDO_HDR ppseudo_hdr;
+ struct pseudo_hdr *ppseudo_hdr;
PUSHORT pmsg;
struct timeval tv;
union {
@@ -1066,7 +1066,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
len = htons(len);
pmsg = (PUSHORT) ptr->pprov_data;
- ppseudo_hdr = (PPSEUDO_HDR) pmsg;
+ ppseudo_hdr = (struct pseudo_hdr *) pmsg;
// Insert slow queue sequence number
ppseudo_hdr->seq_num = info->squeseqnum++;
ppseudo_hdr->portsrc = 0;
@@ -1185,7 +1185,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
// Put message into Slow Queue
// Form Pseudo header
pmsg = (PUSHORT) info->DSPInfoBlk;
- ppseudo_hdr = (PPSEUDO_HDR) pmsg;
+ ppseudo_hdr = (struct pseudo_hdr *) pmsg;
ppseudo_hdr->length =
htons(info->DSPInfoBlklen + 4);
ppseudo_hdr->source = 0x10;
@@ -1234,7 +1234,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
// Put message into Slow Queue
// Form Pseudo header
pmsg = (PUSHORT) & tempbuffer[0];
- ppseudo_hdr = (PPSEUDO_HDR) pmsg;
+ ppseudo_hdr = (struct pseudo_hdr *) pmsg;
ppseudo_hdr->length = htons(0x0012);
ppseudo_hdr->source = 0x10;
ppseudo_hdr->destination = 0x20;
@@ -1788,9 +1788,9 @@ int ft1000_copy_down_pkt(struct net_device *dev, u16 * packet, u16 len)
{
FT1000_INFO *info = netdev_priv(dev);
union {
- PSEUDO_HDR blk;
- u16 buff[sizeof(PSEUDO_HDR) >> 1];
- u8 buffc[sizeof(PSEUDO_HDR)];
+ struct pseudo_hdr blk;
+ u16 buff[sizeof(struct pseudo_hdr) >> 1];
+ u8 buffc[sizeof(struct pseudo_hdr)];
} pseudo;
int i;
u32 *plong;
--
Ondrej Zary
next prev parent reply other threads:[~2011-06-30 22:09 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-30 22:03 [PATCH 00/28] staging: ft1000-pcmcia: various fixes Ondrej Zary
2011-06-30 22:03 ` [PATCH 01/28] staging: ft1000-pcmcia: don't crash on load Ondrej Zary
2011-06-30 22:03 ` [PATCH 02/28] staging: ft1000-pcmcia: fix compilation with FT_DEBUG enabled Ondrej Zary
2011-06-30 22:03 ` [PATCH 03/28] staging: ft1000-pcmcia: delete ft1000.conf Ondrej Zary
2011-06-30 22:03 ` [PATCH 04/28] staging: ft1000-pcmcia: get rid of ft1000_dev.h Ondrej Zary
2011-06-30 22:03 ` Ondrej Zary [this message]
2011-06-30 22:03 ` [PATCH 06/28] staging: ft1000-pcmcia: remove DRVMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 07/28] staging: ft1000-pcmcia: remove MEDIAMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 08/28] staging: ft1000-pcmcia: delete unused TIMEMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 09/28] staging: ft1000-pcmcia: remove DSPINITMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 10/28] staging: ft1000-pcmcia: delete unused DSPHIBERNATE typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 11/28] staging: ft1000-pcmcia: delete unused APP_INFO_BLOCK typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 12/28] staging: ft1000-pcmcia: remove PROV_RECORD typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 13/28] staging: ft1000-pcmcia: remove FT1000_INFO typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 14/28] staging: ft1000-pcmcia: delete unused DPRAM_BLK typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 15/28] staging: ft1000-pcmcia: delete local_info_t typedef Ondrej Zary
2011-06-30 22:03 ` [PATCH 16/28] staging: ft1000-pcmcia: remove firmware download typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 17/28] staging: ft1000-pcmcia: remove unused fields from struct ft1000_info Ondrej Zary
2011-06-30 22:03 ` [PATCH 18/28] staging: ft1000-pcmcia: remove custom defines for standard types Ondrej Zary
2011-06-30 22:03 ` [PATCH 19/28] staging: ft1000-pcmcia: remove useless defines from ft1000_cs.c Ondrej Zary
2011-06-30 22:03 ` [PATCH 20/28] staging: ft1000-pcmcia: remove useless debugging " Ondrej Zary
2011-06-30 22:03 ` [PATCH 21/28] staging: ft1000-pcmcia: remove misleading and template comments " Ondrej Zary
2011-06-30 22:03 ` [PATCH 22/28] staging: ft1000-pcmcia: remove unused ft1000_asic_read and ft1000_asic_write functions Ondrej Zary
2011-06-30 22:03 ` [PATCH 23/28] staging: ft1000-pcmcia: coding style fixes in ft1000_cs.c Ondrej Zary
2011-06-30 22:03 ` [PATCH 24/28] staging: ft1000-pcmcia: remove unused includes from ft1000_cs.c Ondrej Zary
2011-06-30 22:03 ` [PATCH 25/28] staging: ft1000-pcmcia: remove useless ft1000_release() function Ondrej Zary
2011-06-30 22:03 ` [PATCH 26/28] staging: ft1000-pcmcia: CodingStyle fixes in ft1000.h Ondrej Zary
2011-06-30 22:03 ` [PATCH 27/28] staging: ft1000-pcmcia: remove PSEUDOSZ, use sizeof(struct pseudo_hdr) instead Ondrej Zary
2011-06-30 22:03 ` [PATCH 28/28] staging: ft1000-pcmcia: remove support for v5 firmware Ondrej Zary
2011-07-05 17:35 ` [PATCH 00/28] staging: ft1000-pcmcia: various fixes Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309471437-12633-6-git-send-email-linux@rainbow-software.org \
--to=linux@rainbow-software.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marek.belisko@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox