Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0759a5f authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files

tridentfb: convert is_blade and is_xp macros into functions 



This patch converts the is_blade() and is_xp() macros into local functions.

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6eed8e1e

drivers/video/tridentfb.c

+19 −0
Original line number Diff line number Diff line
@@ -78,6 +78,25 @@ MODULE_PARM_DESC(fp, "Define if flatpanel is connected"); 
module_param(crt, int, 0);

MODULE_PARM_DESC(crt, "Define if CRT is connected");



static int is_blade(int id)

{

	return	(id == BLADE3D) ||

		(id == CYBERBLADEE4) ||

		(id == CYBERBLADEi7) ||

		(id == CYBERBLADEi7D) ||

		(id == CYBERBLADEi1) ||

		(id == CYBERBLADEi1D) ||

		(id == CYBERBLADEAi1) ||

		(id == CYBERBLADEAi1D);

}



static int is_xp(int id)

{

	return	(id == CYBERBLADEXPAi1) ||

		(id == CYBERBLADEXPm8) ||

		(id == CYBERBLADEXPm16);

}



static int is3Dchip(int id)

{

	return ((id == BLADE3D) || (id == CYBERBLADEE4) ||

include/video/trident.h

+0 −19
Original line number Diff line number Diff line
@@ -39,25 +39,6 @@ 
#define CYBERBLADEXPm8  0x9910

#define CYBERBLADEXPm16 0x9930



/* acceleration families */

#define IMAGE	0

#define BLADE	1

#define XP	2



#define is_image(id)	

#define is_xp(id)	((id == CYBERBLADEXPAi1) ||\

			 (id == CYBERBLADEXPm8) ||\

			 (id == CYBERBLADEXPm16)) 



#define is_blade(id)	((id == BLADE3D) ||\

			 (id == CYBERBLADEE4) ||\

			 (id == CYBERBLADEi7) ||\

			 (id == CYBERBLADEi7D) ||\

			 (id == CYBERBLADEi1) ||\

			 (id == CYBERBLADEi1D) ||\

			 (id ==	CYBERBLADEAi1) ||\

			 (id ==	CYBERBLADEAi1D))



/* these defines are for 'lcd' variable */

#define LCD_STRETCH	0

#define LCD_CENTER	1