Skip to contentSkip to conversation

Fix for macro in agp.h

PATCH New Nicolas Aspert 1 participant 1 message Jan 8, 2002 Agpgart driver

lore
Share & tools
lore

Nicolas Aspert

author
#0 lore raw

PATCH 1/1 Fix for macro in agp.h

Hello

Here is a $0.02 patch that fixes the dirty 'A_IDX*' macros in agp.h. These were referring to a variable 'i' that is local to the routine where these macros are called (namely 'agp_generic_create_gatt_table' in 'agpgart_be.c'). The patch is against 2.4.17
Thanks Phil Brown for pointing this one...

Best regards

Signature · 2 lines
Nicolas Aspert      Signal Processing Laboratory (LTS)
Swiss Federal Institute of Technology (EPFL)
drivers/char/agp/agp.h +5 -5
diff -Nru -x CVS -x tcp_diag.c linux-2.4.17.clean/drivers/char/agp/agp.h linux-2.4.17.dirty/drivers/char/agp/agp.h
@@ -143,11 +143,11 @@
 #define A_SIZE_32(x)	((aper_size_info_32 *) x)
 #define A_SIZE_LVL2(x)  ((aper_size_info_lvl2 *) x)
 #define A_SIZE_FIX(x)	((aper_size_info_fixed *) x)
-#define A_IDX8()	(A_SIZE_8(agp_bridge.aperture_sizes) + i)
-#define A_IDX16()	(A_SIZE_16(agp_bridge.aperture_sizes) + i)
-#define A_IDX32()	(A_SIZE_32(agp_bridge.aperture_sizes) + i)
-#define A_IDXLVL2()	(A_SIZE_LVL2(agp_bridge.aperture_sizes) + i)
-#define A_IDXFIX()	(A_SIZE_FIX(agp_bridge.aperture_sizes) + i)
+#define A_IDX8(idx)	(A_SIZE_8(agp_bridge.aperture_sizes) + (idx))
+#define A_IDX16(idx)	(A_SIZE_16(agp_bridge.aperture_sizes) + (idx))
+#define A_IDX32(idx)	(A_SIZE_32(agp_bridge.aperture_sizes) + (idx))
+#define A_IDXLVL2(idx)	(A_SIZE_LVL2(agp_bridge.aperture_sizes) + (idx))
+#define A_IDXFIX(idx)	(A_SIZE_FIX(agp_bridge.aperture_sizes) + (idx))
 #define MAXKEY		(4096 * 32)
 
 #define AGPGART_MODULE_NAME	"agpgart"
drivers/char/agp/agpgart_be.c +3 -3
diff -Nru -x CVS -x tcp_diag.c linux-2.4.17.clean/drivers/char/agp/agpgart_be.c linux-2.4.17.dirty/drivers/char/agp/agpgart_be.c
@@ -586,13 +586,13 @@
 				i++;
 				switch (agp_bridge.size_type) {
 				case U8_APER_SIZE:
-					agp_bridge.current_size = A_IDX8();
+					agp_bridge.current_size = A_IDX8(i);
 					break;
 				case U16_APER_SIZE:
-					agp_bridge.current_size = A_IDX16();
+					agp_bridge.current_size = A_IDX16(i);
 					break;
 				case U32_APER_SIZE:
-					agp_bridge.current_size = A_IDX32();
+					agp_bridge.current_size = A_IDX32(i);
 					break;
 					/* This case will never really 
 					 * happen.