d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The definition for __stdcall logically belongs in pe_var.h, but

Browse Source 
the definitions for NDIS_BUS_SPACE_IO and NDIS_BUS_SPACE_MEM logically
belong in hal_var.h. At least, that's my story, and I'm sticking to it.

Also, remove definition of __stdcall from if_ndis.c now that it's pulled
in from pe_var.h.
This commit is contained in:
Bill Paul 2004-01-15 21:31:49 +00:00
parent ebed999d17
commit ece759a4da
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/compat/ndis/hal_var.h
View File

@ -35,6 +35,14 @@
#ifndef _HAL_VAR_H_ #ifndef _HAL_VAR_H_
#define _HAL_VAR_H_ #define _HAL_VAR_H_
#ifdef __amd64__
#define NDIS_BUS_SPACE_IO AMD64_BUS_SPACE_IO
#define NDIS_BUS_SPACE_MEM AMD64_BUS_SPACE_MEM
#else
#define NDIS_BUS_SPACE_IO I386_BUS_SPACE_IO
#define NDIS_BUS_SPACE_MEM I386_BUS_SPACE_MEM
#endif
extern image_patch_table hal_functbl[]; extern image_patch_table hal_functbl[];
#endif /* _HAL_VAR_H_ */ #endif /* _HAL_VAR_H_ */

4
sys/compat/ndis/pe_var.h
View File

@ -418,12 +418,8 @@ typedef struct image_patch_table image_patch_table;
#ifdef __amd64__ #ifdef __amd64__
#define __stdcall #define __stdcall
#define NDIS_BUS_SPACE_IO AMD64_BUS_SPACE_IO
#define NDIS_BUS_SPACE_MEM AMD64_BUS_SPACE_MEM
#else #else
#define __stdcall __attribute__((__stdcall__)) #define __stdcall __attribute__((__stdcall__))
#define NDIS_BUS_SPACE_IO I386_BUS_SPACE_IO
#define NDIS_BUS_SPACE_MEM I386_BUS_SPACE_MEM
#endif #endif
__BEGIN_DECLS __BEGIN_DECLS

1
sys/compat/ndis/subr_ntoskrnl.c
View File

@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
#include <sys/rman.h> #include <sys/rman.h>
#include <compat/ndis/pe_var.h> #include <compat/ndis/pe_var.h>
#include <compat/ndis/hal_var.h>
#include <compat/ndis/resource_var.h> #include <compat/ndis/resource_var.h>
#include <compat/ndis/ndis_var.h> #include <compat/ndis/ndis_var.h>
#include <compat/ndis/ntoskrnl_var.h> #include <compat/ndis/ntoskrnl_var.h>

2
sys/dev/if_ndis/if_ndis.c
View File

@ -93,8 +93,6 @@ static struct ndis_type ndis_devs[] = {
{ 0, 0, 0, NULL } { 0, 0, 0, NULL }
}; };
#define __stdcall __attribute__((__stdcall__))
static int ndis_probe (device_t); static int ndis_probe (device_t);
static int ndis_attach (device_t); static int ndis_attach (device_t);
static int ndis_detach (device_t); static int ndis_detach (device_t);