diff options
| author | Henk de Groot <henk.de.groot@hetnet.nl> | 2010-05-13 16:27:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-14 13:47:07 -0700 |
| commit | 93822ad193f1b1d92422dc3d539456acbe1a85ef (patch) | |
| tree | b62e92f38a9801cfc4b507ddfc918cc8ac4580b2 /drivers/staging/wlags49_h2/dhf.c | |
| parent | 97a0638218fc504d645c45ff03256dc4520efa72 (diff) | |
| download | op-kernel-dev-93822ad193f1b1d92422dc3d539456acbe1a85ef.zip op-kernel-dev-93822ad193f1b1d92422dc3d539456acbe1a85ef.tar.gz | |
Staging: wlags49_hs2: Fix wlags49_hs2 driver after build fixes broke it
Fixes the driver after merge into the 2.6.34 kernel. Driver should
be functional again (a fix to make it compile broke the driver).
Patch against 2.6.34 RC7 with patch-v2.6.34-rc7-next-20100513
already applied.
Removed conditional code based on kernel version, this is pointless
now the driver is part of the kernel. Also removed obsolte code
left over from previous patches. Includes also small fixes to compile
clean again.
Signed-off-by: Henk de Groot <pe1dnn@amsat.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlags49_h2/dhf.c')
| -rw-r--r-- | drivers/staging/wlags49_h2/dhf.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/wlags49_h2/dhf.c b/drivers/staging/wlags49_h2/dhf.c index 80a4707..bb80b54 100644 --- a/drivers/staging/wlags49_h2/dhf.c +++ b/drivers/staging/wlags49_h2/dhf.c @@ -109,20 +109,6 @@ /* 12345678901234 */ char signature[14] = "FUPU7D37dhfwci"; -/* The binary download function "relocates" the image using constructions like: - fw->identity = (CFG_IDENTITY_STRCT FAR *)((char FAR *)fw->identity + (hcf_32)fw ); - under some of the memory models under MSVC 1.52 these constructions degrade to 16-bits pointer arithmetic. - fw->identity is limited, such that adding it to fw, does not need to carry over from offset to segment. - However the segment is not set at all. - As a workaround the PSEUDO_CHARP macro is introduced which is a char pointer except for MSVC 1.52, in - which case we know that a 32-bit quantity is adequate as a pointer. - Note that other platforms may experience comparable problems when using the binary download feature. */ -#if defined(_MSC_VER) && _MSC_VER == 800 /* Visual C++ 1.5 */ -#define PSEUDO_CHARP hcf_32 -#else -#define PSEUDO_CHARP (hcf_8 *) -#endif - /*----------------------------------------------------------------------------- * * LTV-records retrieved from the NIC to: |
