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

Commit 64a6bd6a authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

viafb: fold via_io.h into via-core.h 



Preparatory move toward the ultimate goal of moving pan-subdevice stuff
into include/linux.

Cc: ScottFang@viatech.com.cn
Cc: JosephChan@via.com.tw
Cc: Harald Welte <laforge@gnumonks.org>
Acked-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent 8bbf50fe

drivers/video/via/hw.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


#include "viamode.h"

#include "global.h"

#include "via_io.h"

#include "via_modesetting.h"



#define viafb_read_reg(p, i)			via_read_reg(p, i)

drivers/video/via/share.h

+3 −8
Original line number Diff line number Diff line
@@ -43,14 +43,9 @@ 
/* Video Memory Size */

#define VIDEO_MEMORY_SIZE_16M    0x1000000



/* standard VGA IO port

/*

 * Lengths of the VPIT structure arrays.

 */

#define VIAStatus   0x3DA

#define VIACR       0x3D4

#define VIASR       0x3C4

#define VIAGR       0x3CE

#define VIAAR       0x3C0



#define StdCR       0x19

#define StdSR       0x04

#define StdGR       0x09

drivers/video/via/via-core.h

+47 −1
Original line number Diff line number Diff line 
/*

 * Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.

 * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.

 * Copyright 2009 Jonathan Corbet <corbet@lwn.net>

 * Copyright 2009-2010 Jonathan Corbet <corbet@lwn.net>

 * Copyright 2010 Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public
@@ -22,6 +23,8 @@ 


#ifndef __VIA_CORE_H__

#define __VIA_CORE_H__

#include <linux/types.h>

#include <linux/io.h>

#include <linux/spinlock.h>

#include <linux/pci.h>
@@ -170,4 +173,47 @@ int viafb_dma_copy_out_sg(unsigned int offset, struct scatterlist *sg, int nsg); 
#define VGA_WIDTH	640

#define VGA_HEIGHT	480



/*

 * Indexed port operations.  Note that these are all multi-op

 * functions; every invocation will be racy if you're not holding

 * reg_lock.

 */



#define VIAStatus   0x3DA  /* Non-indexed port */

#define VIACR       0x3D4

#define VIASR       0x3C4

#define VIAGR       0x3CE

#define VIAAR       0x3C0



static inline u8 via_read_reg(u16 port, u8 index)

{

	outb(index, port);

	return inb(port + 1);

}



static inline void via_write_reg(u16 port, u8 index, u8 data)

{

	outb(index, port);

	outb(data, port + 1);

}



static inline void via_write_reg_mask(u16 port, u8 index, u8 data, u8 mask)

{

	u8 old;



	outb(index, port);

	old = inb(port + 1);

	outb((data & mask) | (old & ~mask), port + 1);

}



#define VIA_MISC_REG_READ	0x03CC

#define VIA_MISC_REG_WRITE	0x03C2



static inline void via_write_misc_reg_mask(u8 data, u8 mask)

{

	u8 old = inb(VIA_MISC_REG_READ);

	outb((data & mask) | (old & ~mask), VIA_MISC_REG_WRITE);

}





#endif /* __VIA_CORE_H__ */

drivers/video/via/via_io.h

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
/*

 * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.

 * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.

 * Copyright 2010 Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public

 * License as published by the Free Software Foundation;

 * either version 2, or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even

 * the implied warranty of MERCHANTABILITY or FITNESS FOR

 * A PARTICULAR PURPOSE.See the GNU General Public License

 * for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc.,

 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 */

/*

 * basic io functions

 */



#ifndef __VIA_IO_H__

#define __VIA_IO_H__



#include <linux/types.h>

#include <linux/io.h>



#define VIA_MISC_REG_READ	0x03CC

#define VIA_MISC_REG_WRITE	0x03C2



/*

 * Indexed port operations.  Note that these are all multi-op

 * functions; every invocation will be racy if you're not holding

 * reg_lock.

 */

static inline u8 via_read_reg(u16 port, u8 index)

{

	outb(index, port);

	return inb(port + 1);

}



static inline void via_write_reg(u16 port, u8 index, u8 data)

{

	outb(index, port);

	outb(data, port + 1);

}



static inline void via_write_reg_mask(u16 port, u8 index, u8 data, u8 mask)

{

	u8 old;



	outb(index, port);

	old = inb(port + 1);

	outb((data & mask) | (old & ~mask), port + 1);

}



static inline void via_write_misc_reg_mask(u8 data, u8 mask)

{

	u8 old = inb(VIA_MISC_REG_READ);

	outb((data & mask) | (old & ~mask), VIA_MISC_REG_WRITE);

}



#endif /* __VIA_IO_H__ */

drivers/video/via/via_modesetting.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


#include <linux/kernel.h>

#include "via_modesetting.h"

#include "via_io.h"

#include "via-core.h"

#include "share.h"

#include "debug.h"