File kmp-01-compile-fixes.diff of Package wanpipe

Overview Repositories Revisions Requests Users Attributes Meta

File kmp-01-compile-fixes.diff of Package wanpipe (Revision e9627c5d4f69d096ba27fe3085e723ff)

Currently displaying revision e9627c5d4f69d096ba27fe3085e723ff , Show latest

From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-07-17 16:15:58.788538325 +0200
Upstream: tbd

Fix a slew of errors (just quickly, paying no attention to kernels before 2.6.34):

Properly use const char *:
sdladrv_src.c:4339:7: warning: passing argument 6 of 'sdla_hwcpu_search' discards qualifiers from pointer target type
sdladrv_src.c:346:15: note: expected 'char *' but argument is of type 'const char *'

Use uintptr_t:
sdladrv_src.c:5629:32: warning: cast from pointer to integer of different size

const char *:
sdladrv_src.c:11095:2: warning: passing argument 5 of 'sdla_card_search' discards qualifiers from pointer target type
sdladrv_src.c:4260:1: note: expected 'char *' but argument is of type 'const char *'
sdladrv_src.c:11097:3: warning: passing argument 5 of 'sdla_card_register' discards qualifiers from pointer target type
sdladrv_src.c:4192:1: note: expected 'char *' but argument is of type 'const char *'
sdladrv_src.c: In function 'sdla_usb_remove':
sdladrv_src.c:11137:2: warning: passing argument 5 of 'sdla_card_search' discards qualifiers from pointer target type
sdladrv_src.c:4260:1: note: expected 'char *' but argument is of type 'const char *'
---
 patches/kdrivers/src/net/sdladrv.c        |   19 +++++++------------
 patches/kdrivers/src/net/wanpipe_logger.c |    2 +-
 patches/kdrivers/src/wanrouter/wanproc.c  |    4 ++--
 3 files changed, 10 insertions(+), 15 deletions(-)

Index: wanpipe-3.5.23/patches/kdrivers/src/net/sdladrv.c
===================================================================
--- wanpipe-3.5.23.orig/patches/kdrivers/src/net/sdladrv.c
+++ wanpipe-3.5.23/patches/kdrivers/src/net/sdladrv.c
@@ -343,12 +343,12 @@ static unsigned	sdla_test_memregion (sdl
 static unsigned short sdla_checksum (unsigned char* buf, unsigned len);
 static int sdla_init_pci_slot(sdlahw_t *);
 
-static sdlahw_card_t* sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, char*);
+static sdlahw_card_t* sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, const char *);
 static int sdla_card_unregister (sdlahw_card_t*);
-static sdlahw_card_t* sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, char*);
+static sdlahw_card_t* sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, const char *);
 static int sdla_card_info(sdlahw_card_t*);
 
-sdlahw_cpu_t* sdla_hwcpu_search(u8, int, int, int, int, char*);
+sdlahw_cpu_t* sdla_hwcpu_search(u8, int, int, int, int, const char *);
 static sdlahw_cpu_t* sdla_hwcpu_register(sdlahw_card_t*, int, int, void*);
 static int sdla_hwcpu_unregister(sdlahw_cpu_t*);
 static int sdla_hwcpu_info(sdlahw_cpu_t*);
@@ -4275,7 +4275,7 @@ static int sdla_card_info(sdlahw_card_t
 }
 
 static sdlahw_card_t*
-sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, char *bus_id)
+sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, const char *bus_id)
 {
 	sdlahw_card_t	*new_hwcard, *last_hwcard;
 
@@ -4344,7 +4344,7 @@ sdla_card_unregister(sdlahw_card_t* hwca
 }
 
 static sdlahw_card_t*
-sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, char *bus_id)
+sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, const char *bus_id)
 {
 	sdlahw_card_t*	tmp;
 	
@@ -4483,7 +4483,7 @@ static int sdla_hwcpu_unregister(sdlahw_
 }
 
 sdlahw_cpu_t*
-sdla_hwcpu_search(u8 hw_type, int bus_no, int slot_no, int ioport, int cpu_no, char *bus_id)
+sdla_hwcpu_search(u8 hw_type, int bus_no, int slot_no, int ioport, int cpu_no, const char *bus_id)
 {
 	sdlahw_cpu_t*	tmp;
 	
@@ -5712,12 +5712,7 @@ static int sdla_bootcfg (sdlahw_t* hw, s
 	if (hwcard->type == SDLA_S514){
 		offset = sfminfo->dataoffs;
 	}else{
-		/* No easy way to avoid compile warning */
-#ifdef __WINDOWS__
-		offset = sfminfo->dataoffs - (unsigned short)hwcpu->vector;
-#else
-		offset = sfminfo->dataoffs - (unsigned int)hwcpu->vector;
-#endif
+		offset = sfminfo->dataoffs - (uintptr_t)hwcpu->vector;
 	}
 
 	sdla_bus_set_region_1(hw, 0x00, 0x00, sfminfo->datasize);
Index: wanpipe-3.5.23/patches/kdrivers/src/wanrouter/wanproc.c
===================================================================
--- wanpipe-3.5.23.orig/patches/kdrivers/src/wanrouter/wanproc.c
+++ wanpipe-3.5.23/patches/kdrivers/src/wanrouter/wanproc.c
@@ -1565,7 +1565,7 @@ int wanrouter_proc_add_protocol(wan_devi
 		p->nlink = 1;
 		p->get_info 	= get_dev_config_info;
 #endif
-		p->data 	= (void*)wandev->config_id;
+		p->data 	= (void *)(uintptr_t)wandev->config_id;
 	
 		/* Create /proc/net/wanrouter/<protocol>/status directory */
 		p = create_proc_entry("status",0,proc_protocol->protocol_entry);
@@ -1584,7 +1584,7 @@ int wanrouter_proc_add_protocol(wan_devi
 		p->nlink = 1;
 		p->get_info 	= get_dev_status_info;
 #endif
-		p->data 	= (void*)wandev->config_id;
+		p->data 	= (void *)(uintptr_t)wandev->config_id;
 	}	
 	
 	/* Create /proc/net/wanrouter/<protocol>/<wanpipe#> directory */

Places

File kmp-01-compile-fixes.diff of Package wanpipe (Revision e9627c5d4f69d096ba27fe3085e723ff)

Places