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

Commit fb44d9a5 authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman
Browse files

staging/xgifb: Move register helper functions to header 



and mark them as static inline.
This shrinks the compiled module from 137442 to 117732 bytes and we also
get rid of vb_util.c

Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d5a3a945

drivers/staging/xgifb/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_FB_XGI)  += xgifb.o



xgifb-y := XGI_main_26.o vb_init.o vb_setmode.o vb_util.o

xgifb-y := XGI_main_26.o vb_init.o vb_setmode.o

drivers/staging/xgifb/vb_util.c

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
#include "vgatypes.h"

#include "vb_util.h"



void xgifb_reg_set(unsigned long port, u8 index, u8 data)

{

	outb(index, port);

	outb(data, port + 1);

}



u8 xgifb_reg_get(unsigned long port, u8 index)

{

	outb(index, port);

	return inb(port + 1);

}



void xgifb_reg_and_or(unsigned long port, u8 index,

		unsigned data_and, unsigned data_or)

{

	u8 temp;



	temp = xgifb_reg_get(port, index); /* XGINew_Part1Port index 02 */

	temp = (temp & data_and) | data_or;

	xgifb_reg_set(port, index, temp);

}



void xgifb_reg_and(unsigned long port, u8 index, unsigned data_and)

{

	u8 temp;



	temp = xgifb_reg_get(port, index); /* XGINew_Part1Port index 02 */

	temp &= data_and;

	xgifb_reg_set(port, index, temp);

}



void xgifb_reg_or(unsigned long port, u8 index, unsigned data_or)

{

	u8 temp;



	temp = xgifb_reg_get(port, index); /* XGINew_Part1Port index 02 */

	temp |= data_or;

	xgifb_reg_set(port, index, temp);

}

drivers/staging/xgifb/vb_util.h

+39 −5
Original line number Diff line number Diff line 
#ifndef _VBUTIL_

#define _VBUTIL_

extern void xgifb_reg_set(unsigned long, u8, u8);

extern u8 xgifb_reg_get(unsigned long, u8);

extern void xgifb_reg_or(unsigned long, u8, unsigned);

extern void xgifb_reg_and(unsigned long, u8, unsigned);

extern void xgifb_reg_and_or(unsigned long, u8, unsigned, unsigned);

static inline void xgifb_reg_set(unsigned long port, u8 index, u8 data)

{

	outb(index, port);

	outb(data, port + 1);

}



static inline u8 xgifb_reg_get(unsigned long port, u8 index)

{

	outb(index, port);

	return inb(port + 1);

}



static inline void xgifb_reg_and_or(unsigned long port, u8 index,

				    unsigned data_and, unsigned data_or)

{

	u8 temp;



	temp = xgifb_reg_get(port, index);

	temp = (temp & data_and) | data_or;

	xgifb_reg_set(port, index, temp);

}



static inline void xgifb_reg_and(unsigned long port, u8 index, unsigned data_and)

{

	u8 temp;



	temp = xgifb_reg_get(port, index);

	temp &= data_and;

	xgifb_reg_set(port, index, temp);

}



static inline void xgifb_reg_or(unsigned long port, u8 index, unsigned data_or)

{

	u8 temp;



	temp = xgifb_reg_get(port, index);

	temp |= data_or;

	xgifb_reg_set(port, index, temp);

}

#endif