Project : madwifi
Revision : 2541
Author : proski (Pavel Roskin)
Date : 2007-07-05 22:48:41 +0200 (Thu, 05 Jul 2007)
Log Message :
Get rid of if_ath_hal.c
This file is constant and doesn't need to be generated. Remove all
references to it. Merge its contents into if_ath_hal_wrappers.c for now.
Affected Files:
* trunk/Makefile updated
* trunk/ath/ properties updated
* trunk/ath/Makefile updated
* trunk/ath/if_ath_hal_macros.h updated
* trunk/ath/if_ath_hal_wrappers.c updated
* trunk/scripts/if_ath_hal_generator.pl updated
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2007-07-05 20:36:33 UTC (rev 2540)
+++ trunk/Makefile 2007-07-05 20:48:41 UTC (rev 2541)
@@ -56,10 +56,10 @@
all: modules tools
-ath/if_ath_hal.c ath/if_ath_hal.h: hal/ah.h
+ath/if_ath_hal.h: hal/ah.h
scripts/if_ath_hal_generator.pl
-modules: configcheck ath/if_ath_hal.h ath/if_ath_hal.c svnversion.h
+modules: configcheck ath/if_ath_hal.h svnversion.h
ifdef LINUX24
for i in $(DIRS_MODULES); do \
$(MAKE) -C $$i || exit 1; \
@@ -114,7 +114,7 @@
-$(MAKE) -C $(TOOLS) clean
rm -rf .tmp_versions
rm -f *.symvers svnversion.h
- rm -f ath/if_ath_hal.c ath/if_ath_hal.h
+ rm -f ath/if_ath_hal.h
info:
@echo "The following settings will be used for compilation:"
Property changes on: trunk/ath
___________________________________________________________________
Name: svn:ignore
- .*.cmd
.*.flags
*.o
*.ko
*.mod.c
if_ath_hal.h
if_ath_hal.c
+ .*.cmd
.*.flags
*.o
*.ko
*.mod.c
if_ath_hal.h
Modified: trunk/ath/Makefile
===================================================================
--- trunk/ath/Makefile 2007-07-05 20:36:33 UTC (rev 2540)
+++ trunk/ath/Makefile 2007-07-05 20:48:41 UTC (rev 2541)
@@ -57,7 +57,7 @@
include $(TOP)/Makefile.inc
obj-m += ath_$(BUSNAME).o
-ath_$(BUSNAME)-objs := if_ath.o if_ath_hal.o if_ath_hal_wrappers.o
if_ath_$(BUSNAME).o
+ath_$(BUSNAME)-objs := if_ath.o if_ath_hal_wrappers.o if_ath_$(BUSNAME).o
INCS += -I$(TOP) -I$(ATH_HAL) -I$(HAL) -I$(WLAN)
Modified: trunk/ath/if_ath_hal_macros.h
===================================================================
--- trunk/ath/if_ath_hal_macros.h 2007-07-05 20:36:33 UTC (rev 2540)
+++ trunk/ath/if_ath_hal_macros.h 2007-07-05 20:48:41 UTC (rev 2541)
@@ -36,19 +36,16 @@
* $Id: foo mtaylor $
*/
/*
- * This file provides some macros that are used by if_ath_hal.h, if_ath_hal.c,
- * if_ath_hal_wrappers.h, and , if_ath_hal_wrappers.c.
+ * This file provides some macros that are used by if_ath_hal.h,
+ * if_ath_hal_wrappers.h, and if_ath_hal_wrappers.c.
*
* The macros are provided for the HAL lock and for dynamically deciding
whether
* to define the HAL wrapper functions as inline or in the implementation file
* at build time. i.e. inline for speed, or non-inline for debugging
visibility
* into the HAL methods being called (despite obfuscation).
*
- * The if_ath_hal.* files are generated from hal/ah.h at build time by the
build
- * system and the files if_ath_hal_custom.h and if_ath_hal_custom.c are hand
- * created additions to the API that are just wrappers to the functions in
- * declared in if_ath_hal.h.
- *
+ * The if_ath_hal.h file is generated from hal/ah.h at build time by the build
+ * system.
*/
#ifndef _IF_ATH_HAL_MACROS_H_
#define _IF_ATH_HAL_MACROS_H_
Modified: trunk/ath/if_ath_hal_wrappers.c
===================================================================
--- trunk/ath/if_ath_hal_wrappers.c 2007-07-05 20:36:33 UTC (rev 2540)
+++ trunk/ath/if_ath_hal_wrappers.c 2007-07-05 20:48:41 UTC (rev 2541)
@@ -73,5 +73,13 @@
#include "ath/if_ath_hal_wrappers.h"
#undef TRACEABLE_IMPL
+/* Include header file for declarations */
+#include "ath/if_ath_hal.h"
+
+/* Include header file for implementations (if necessary) */
+#define TRACEABLE_IMPL
+#include "ath/if_ath_hal.h"
+#undef TRACEABLE_IMPL
+
#endif /* #ifdef ATH_HALOPS_TRACEABLE */
Modified: trunk/scripts/if_ath_hal_generator.pl
===================================================================
--- trunk/scripts/if_ath_hal_generator.pl 2007-07-05 20:36:33 UTC (rev
2540)
+++ trunk/scripts/if_ath_hal_generator.pl 2007-07-05 20:48:41 UTC (rev
2541)
@@ -50,7 +50,6 @@
my $path_to_hal = 'hal';
my $path_to_ath = 'ath';
my $hal_h = 'ah.h';
-my $if_ath_hal_c = 'if_ath_hal.c';
my $if_ath_hal_h = 'if_ath_hal.h';
#
@@ -272,7 +271,6 @@
# Include settings, calculate a few new ones
my $path_to_ah_h = "$path_to_hal/$hal_h";
my $path_to_if_ath_hal_h = "$path_to_ath/$if_ath_hal_h";
-my $path_to_if_ath_hal_c = "$path_to_ath/$if_ath_hal_c";
# Parsed Function Data
@@ -293,11 +291,6 @@
close AH_H;
die "Cannot open $path_to_if_ath_hal_h: $!";
}
-if(!open ATH_HAL_API_C, ">$path_to_if_ath_hal_c") {
- close AH_H;
- close ATH_HAL_API_H;
- die "Cannot open $path_to_if_ath_hal_c: $!";
-}
# Parse and scrub the hal structure's member function declarations
my $line_continued = 0;
@@ -400,22 +393,7 @@
}
print ATH_HAL_API_H $footer_for_h;
-#
-# Generate the implementation file
-#
-print ATH_HAL_API_C $header_for_c;
-print ATH_HAL_API_C "/* Include header file for declarations */\n";
-print ATH_HAL_API_C "#include \"$path_to_if_ath_hal_h\"\n";
-print ATH_HAL_API_C "\n";
-print ATH_HAL_API_C "/* Include header file for implementations (if necessary)
*/\n";
-print ATH_HAL_API_C "#define TRACEABLE_IMPL\n";
-print ATH_HAL_API_C "#include \"$path_to_if_ath_hal_h\"\n";
-print ATH_HAL_API_C "#undef TRACEABLE_IMPL\n";
-print ATH_HAL_API_C "\n";
-print ATH_HAL_API_C $footer_for_c;
-
# Close up the files
close AH_H;
close ATH_HAL_API_H;
-close ATH_HAL_API_C;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
|
