Commit 959f85f8 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Consolidated SH7751/SH7780 PCI support. 



This cleans up quite a lot of the PCI mess that we
currently have, and attempts to consolidate the
duplication in the SH7780 and SH7751 PCI controllers.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent e108b2ca

arch/sh/boards/landisk/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -3,5 +3,3 @@ 
#



obj-y	 := setup.o io.o irq.o rtc.o landisk_pwb.o
 


obj-$(CONFIG_PCI) += pci.o

arch/sh/boards/landisk/io.c

+33 −67
Original line number Diff line number Diff line
@@ -14,39 +14,16 @@ 
 * modifed by kogiidena

 * 2005.03.03

 */



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/pci.h>

#include <asm/landisk/iodata_landisk.h>

#include <asm/addrspace.h>

#include <asm/io.h>



#include <linux/module.h>

#include <linux/pci.h>

#include "../../drivers/pci/pci-sh7751.h"



extern void *area5_io_base;	/* Area 5 I/O Base address */

extern void *area6_io_base;	/* Area 6 I/O Base address */



/*

 * The 7751R LANDISK uses the built-in PCI controller (PCIC)

 * of the 7751R processor, and has a SuperIO accessible via the PCI.

 * The board also includes a PCMCIA controller on its memory bus,

 * like the other Solution Engine boards.

 */



#define PCIIOBR		(volatile long *)PCI_REG(SH7751_PCIIOBR)

#define PCIMBR          (volatile long *)PCI_REG(SH7751_PCIMBR)

#define PCI_IO_AREA	SH7751_PCI_IO_BASE

#define PCI_MEM_AREA	SH7751_PCI_CONFIG_BASE



#define PCI_IOMAP(adr)	(PCI_IO_AREA + (adr & ~SH7751_PCIIOBR_MASK))



static inline void delay(void)

{

	ctrl_inw(0xa0000000);

}



static inline unsigned long port2adr(unsigned int port)

{

	if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
@@ -67,17 +44,6 @@ static inline unsigned long port2adr(unsigned int port) 
	return port;

}



/* In case someone configures the kernel w/o PCI support: in that */

/* scenario, don't ever bother to check for PCI-window addresses */



/* NOTE: WINDOW CHECK MAY BE A BIT OFF, HIGH PCIBIOS_MIN_IO WRAPS? */

#if defined(CONFIG_PCI)

#define CHECK_SH7751_PCIIO(port) \

  ((port >= PCIBIOS_MIN_IO) && (port < (PCIBIOS_MIN_IO + SH7751_PCI_IO_SIZE)))

#else

#define CHECK_SH_7751_PCIIO(port) (0)

#endif



/*

 * General outline: remap really low stuff [eventually] to SuperIO,

 * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
@@ -89,8 +55,8 @@ u8 landisk_inb(unsigned long port) 
{

	if (PXSEG(port))

		return ctrl_inb(port);

	else if (CHECK_SH7751_PCIIO(port))

		return ctrl_inb(PCI_IOMAP(port));

	else if (is_pci_ioaddr(port))

		return ctrl_inb(pci_ioaddr(port));



	return ctrl_inw(port2adr(port)) & 0xff;

}
@@ -101,12 +67,12 @@ u8 landisk_inb_p(unsigned long port) 


	if (PXSEG(port))

		v = ctrl_inb(port);

	else if (CHECK_SH7751_PCIIO(port))

		v = ctrl_inb(PCI_IOMAP(port));

	else if (is_pci_ioaddr(port))

		v = ctrl_inb(pci_ioaddr(port));

	else

		v = ctrl_inw(port2adr(port)) & 0xff;



	delay();

	ctrl_delay();



	return v;

}
@@ -115,8 +81,8 @@ u16 landisk_inw(unsigned long port) 
{

	if (PXSEG(port))

		return ctrl_inw(port);

	else if (CHECK_SH7751_PCIIO(port))

		return ctrl_inw(PCI_IOMAP(port));

	else if (is_pci_ioaddr(port))

		return ctrl_inw(pci_ioaddr(port));

	else

		maybebadio(port);
@@ -127,8 +93,8 @@ u32 landisk_inl(unsigned long port) 
{

	if (PXSEG(port))

		return ctrl_inl(port);

	else if (CHECK_SH7751_PCIIO(port))

		return ctrl_inl(PCI_IOMAP(port));

	else if (is_pci_ioaddr(port))

		return ctrl_inl(pci_ioaddr(port));

	else

		maybebadio(port);
@@ -139,8 +105,8 @@ void landisk_outb(u8 value, unsigned long port) 
{

	if (PXSEG(port))

		ctrl_outb(value, port);

	else if (CHECK_SH7751_PCIIO(port))

		ctrl_outb(value, PCI_IOMAP(port));

	else if (is_pci_ioaddr(port))

		ctrl_outb(value, pci_ioaddr(port));

	else

		ctrl_outw(value, port2adr(port));

}
@@ -149,19 +115,19 @@ void landisk_outb_p(u8 value, unsigned long port) 
{

	if (PXSEG(port))

		ctrl_outb(value, port);

	else if (CHECK_SH7751_PCIIO(port))

		ctrl_outb(value, PCI_IOMAP(port));

	else if (is_pci_ioaddr(port))

		ctrl_outb(value, pci_ioaddr(port));

	else

		ctrl_outw(value, port2adr(port));

	delay();

	ctrl_delay();

}



void landisk_outw(u16 value, unsigned long port)

{

	if (PXSEG(port))

		ctrl_outw(value, port);

	else if (CHECK_SH7751_PCIIO(port))

		ctrl_outw(value, PCI_IOMAP(port));

	else if (is_pci_ioaddr(port))

		ctrl_outw(value, pci_ioaddr(port));

	else

		maybebadio(port);

}
@@ -170,8 +136,8 @@ void landisk_outl(u32 value, unsigned long port) 
{

	if (PXSEG(port))

		ctrl_outl(value, port);

	else if (CHECK_SH7751_PCIIO(port))

		ctrl_outl(value, PCI_IOMAP(port));

	else if (is_pci_ioaddr(port))

		ctrl_outl(value, pci_ioaddr(port));

	else

		maybebadio(port);

}
@@ -184,8 +150,8 @@ void landisk_insb(unsigned long port, void *dst, unsigned long count) 
        if (PXSEG(port)) {

                while (count--)

                        *buf++ = *(volatile u8 *)port;

	} else if (CHECK_SH7751_PCIIO(port)) {

                volatile u8 *bp = (volatile u8 *)PCI_IOMAP(port);

	} else if (is_pci_ioaddr(port)) {

                volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);



                while (count--)

                        *buf++ = *bp;
@@ -203,8 +169,8 @@ void landisk_insw(unsigned long port, void *dst, unsigned long count) 


	if (PXSEG(port))

		p = (volatile u16 *)port;

	else if (CHECK_SH7751_PCIIO(port))

		p = (volatile u16 *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port))

		p = (volatile u16 *)pci_ioaddr(port);

	else

		p = (volatile u16 *)port2adr(port);

	while (count--)
@@ -215,8 +181,8 @@ void landisk_insl(unsigned long port, void *dst, unsigned long count) 
{

        u32 *buf = dst;



	if (CHECK_SH7751_PCIIO(port)) {

                volatile u32 *p = (volatile u32 *)PCI_IOMAP(port);

	if (is_pci_ioaddr(port)) {

                volatile u32 *p = (volatile u32 *)pci_ioaddr(port);



                while (count--)

                        *buf++ = *p;
@@ -232,8 +198,8 @@ void landisk_outsb(unsigned long port, const void *src, unsigned long count) 
	if (PXSEG(port))

                while (count--)

                        ctrl_outb(*buf++, port);

	else if (CHECK_SH7751_PCIIO(port)) {

                volatile u8 *bp = (volatile u8 *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port)) {

                volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);



                while (count--)

                        *bp = *buf++;
@@ -251,8 +217,8 @@ void landisk_outsw(unsigned long port, const void *src, unsigned long count) 


	if (PXSEG(port))

                p = (volatile u16 *)port;

	else if (CHECK_SH7751_PCIIO(port))

                p = (volatile u16 *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port))

                p = (volatile u16 *)pci_ioaddr(port);

	else

                p = (volatile u16 *)port2adr(port);
@@ -264,8 +230,8 @@ void landisk_outsl(unsigned long port, const void *src, unsigned long count) 
{

        const u32 *buf = src;



	if (CHECK_SH7751_PCIIO(port)) {

                volatile u32 *p = (volatile u32 *)PCI_IOMAP(port);

	if (is_pci_ioaddr(port)) {

                volatile u32 *p = (volatile u32 *)pci_ioaddr(port);



                while (count--)

                        *p = *buf++;
@@ -277,8 +243,8 @@ void __iomem *landisk_ioport_map(unsigned long port, unsigned int size) 
{

        if (PXSEG(port))

                return (void __iomem *)port;

        else if (CHECK_SH7751_PCIIO(port))

                return (void __iomem *)PCI_IOMAP(port);

        else if (is_pci_ioaddr(port))

                return (void __iomem *)pci_ioaddr(port);



        return (void __iomem *)port2adr(port);

}

arch/sh/boards/mpc1211/setup.c

+2 −13
Original line number Diff line number Diff line
@@ -255,23 +255,12 @@ void __init init_mpc1211_IRQ(void) 
	}

}



/*

  Initialize the board

*/





static void delay (void)

{

	volatile unsigned short tmp;

	tmp = *(volatile unsigned short *) 0xa0000000;

}



static void delay1000(void)

{

	int i;



	for (i=0; i<1000; i++)

		delay ();

		ctrl_delay();

}



static int put_smb_blk(unsigned char *p, int address, int command, int no)

arch/sh/boards/renesas/hs7751rvoip/io.c

+38 −78
Original line number Diff line number Diff line
@@ -13,14 +13,11 @@ 


#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/module.h>

#include <asm/io.h>

#include <asm/hs7751rvoip/hs7751rvoip.h>

#include <asm/addrspace.h>



#include <linux/module.h>

#include <linux/pci.h>

#include "../../../drivers/pci/pci-sh7751.h"



extern void *area6_io8_base;	/* Area 6 8bit I/O Base address */

extern void *area5_io16_base;	/* Area 5 16bit I/O Base address */
@@ -31,27 +28,17 @@ extern void *area5_io16_base; /* Area 5 16bit I/O Base address */ 
 * like the other Solution Engine boards.

 */



#define PCIIOBR		(volatile long *)PCI_REG(SH7751_PCIIOBR)

#define PCIMBR          (volatile long *)PCI_REG(SH7751_PCIMBR)

#define PCI_IO_AREA	SH7751_PCI_IO_BASE

#define PCI_MEM_AREA	SH7751_PCI_CONFIG_BASE

#define PCI_IOMAP(adr)	(PCI_IO_AREA + (adr & ~SH7751_PCIIOBR_MASK))



#define CODEC_IO_BASE	0x1000

#define CODEC_IOMAP(a)	((unsigned long)area6_io8_base + ((a) - CODEC_IO_BASE))



static inline void delay(void)

{

	ctrl_inw(0xa0000000);

}



static inline unsigned long port2adr(unsigned int port)

{

	if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)

		if (port == 0x3f6)

			return ((unsigned long)area5_io16_base + 0x0c);

		else

			return ((unsigned long)area5_io16_base + 0x800 + ((port-0x1f0) << 1));

			return ((unsigned long)area5_io16_base + 0x800 +

				((port-0x1f0) << 1));

	else

		maybebadio((unsigned long)port);

	return port;
@@ -70,25 +57,10 @@ static inline int shifted_port(unsigned long port) 
}



#if defined(CONFIG_HS7751RVOIP_CODEC)

static inline int

codec_port(unsigned long port)

{

	if (CODEC_IO_BASE <= port && port < (CODEC_IO_BASE+0x20))

		return 1;

	else

		return 0;

}

#endif



/* In case someone configures the kernel w/o PCI support: in that */

/* scenario, don't ever bother to check for PCI-window addresses */



/* NOTE: WINDOW CHECK MAY BE A BIT OFF, HIGH PCIBIOS_MIN_IO WRAPS? */

#if defined(CONFIG_PCI)

#define CHECK_SH7751_PCIIO(port) \

  ((port >= PCIBIOS_MIN_IO) && (port < (PCIBIOS_MIN_IO + SH7751_PCI_IO_SIZE)))

#define codec_port(port)	\

	((CODEC_IO_BASE <= (port)) && ((port) < (CODEC_IO_BASE + 0x20)))

#else

#define CHECK_SH7751_PCIIO(port) (0)

#define codec_port(port)	(0)

#endif



/*
@@ -102,12 +74,10 @@ unsigned char hs7751rvoip_inb(unsigned long port) 
{

	if (PXSEG(port))

		return ctrl_inb(port);

#if defined(CONFIG_HS7751RVOIP_CODEC)

	else if (codec_port(port))

		return ctrl_inb(CODEC_IOMAP(port));

#endif

	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))

		return ctrl_inb(PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		return ctrl_inb(pci_ioaddr(port));

	else

		return ctrl_inw(port2adr(port)) & 0xff;

}
@@ -118,15 +88,13 @@ unsigned char hs7751rvoip_inb_p(unsigned long port) 


        if (PXSEG(port))

		v = ctrl_inb(port);

#if defined(CONFIG_HS7751RVOIP_CODEC)

	else if (codec_port(port))

		v = ctrl_inb(CODEC_IOMAP(port));

#endif

	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))

		v = ctrl_inb(PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		v = ctrl_inb(pci_ioaddr(port));

	else

		v = ctrl_inw(port2adr(port)) & 0xff;

	delay();

	ctrl_delay();

	return v;

}
@@ -134,8 +102,8 @@ unsigned short hs7751rvoip_inw(unsigned long port) 
{

        if (PXSEG(port))

		return ctrl_inw(port);

	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))

		return ctrl_inw(PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		return ctrl_inw(pci_ioaddr(port));

	else

		maybebadio(port);

	return 0;
@@ -145,8 +113,8 @@ unsigned int hs7751rvoip_inl(unsigned long port) 
{

        if (PXSEG(port))

		return ctrl_inl(port);

	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))

		return ctrl_inl(PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		return ctrl_inl(pci_ioaddr(port));

	else

		maybebadio(port);

	return 0;
@@ -157,12 +125,10 @@ void hs7751rvoip_outb(unsigned char value, unsigned long port) 


        if (PXSEG(port))

		ctrl_outb(value, port);

#if defined(CONFIG_HS7751RVOIP_CODEC)

	else if (codec_port(port))

		ctrl_outb(value, CODEC_IOMAP(port));

#endif

	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))

		ctrl_outb(value, PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		ctrl_outb(value, pci_ioaddr(port));

	else

		ctrl_outb(value, port2adr(port));

}
@@ -171,24 +137,22 @@ void hs7751rvoip_outb_p(unsigned char value, unsigned long port) 
{

        if (PXSEG(port))

		ctrl_outb(value, port);

#if defined(CONFIG_HS7751RVOIP_CODEC)

	else if (codec_port(port))

		ctrl_outb(value, CODEC_IOMAP(port));

#endif

	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))

		ctrl_outb(value, PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		ctrl_outb(value, pci_ioaddr(port));

	else

		ctrl_outw(value, port2adr(port));



	delay();

	ctrl_delay();

}



void hs7751rvoip_outw(unsigned short value, unsigned long port)

{

        if (PXSEG(port))

		ctrl_outw(value, port);

	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))

		ctrl_outw(value, PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		ctrl_outw(value, pci_ioaddr(port));

	else

		maybebadio(port);

}
@@ -197,8 +161,8 @@ void hs7751rvoip_outl(unsigned int value, unsigned long port) 
{

        if (PXSEG(port))

		ctrl_outl(value, port);

	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))

		ctrl_outl(value, PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		ctrl_outl(value, pci_ioaddr(port));

	else

		maybebadio(port);

}
@@ -210,13 +174,11 @@ void hs7751rvoip_insb(unsigned long port, void *addr, unsigned long count) 
	if (PXSEG(port))

		while (count--)

			*buf++ = ctrl_inb(port);

#if defined(CONFIG_HS7751RVOIP_CODEC)

	else if (codec_port(port))

		while (count--)

			*buf++ = ctrl_inb(CODEC_IOMAP(port));

#endif

	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {

		volatile u8 *bp = (volatile u8 *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port) || shifted_port(port)) {

		volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);



		while (count--)

			*buf++ = *bp;
@@ -235,8 +197,8 @@ void hs7751rvoip_insw(unsigned long port, void *addr, unsigned long count) 


	if (PXSEG(port))

		p = (volatile u16 *)port;

	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))

		p = (volatile u16 *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port) || shifted_port(port))

		p = (volatile u16 *)pci_ioaddr(port);

	else

		p = (volatile u16 *)port2adr(port);

	while (count--)
@@ -246,8 +208,8 @@ void hs7751rvoip_insw(unsigned long port, void *addr, unsigned long count) 
void hs7751rvoip_insl(unsigned long port, void *addr, unsigned long count)

{



	if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {

		volatile u32 *p = (volatile u32 *)PCI_IOMAP(port);

	if (is_pci_ioaddr(port) || shifted_port(port)) {

		volatile u32 *p = (volatile u32 *)pci_ioaddr(port);

		u32 *buf = addr;



		while (count--)
@@ -263,13 +225,11 @@ void hs7751rvoip_outsb(unsigned long port, const void *addr, unsigned long count 
	if (PXSEG(port))

		while (count--)

			ctrl_outb(*buf++, port);

#if defined(CONFIG_HS7751RVOIP_CODEC)

	else if (codec_port(port))

		while (count--)

			ctrl_outb(*buf++, CODEC_IOMAP(port));

#endif

	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {

		volatile u8 *bp = (volatile u8 *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port) || shifted_port(port)) {

		volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);



		while (count--)

			*bp = *buf++;
@@ -288,8 +248,8 @@ void hs7751rvoip_outsw(unsigned long port, const void *addr, unsigned long count 


	if (PXSEG(port))

		p = (volatile u16 *)port;

	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))

		p = (volatile u16 *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port) || shifted_port(port))

		p = (volatile u16 *)pci_ioaddr(port);

	else

		p = (volatile u16 *)port2adr(port);
@@ -301,8 +261,8 @@ void hs7751rvoip_outsl(unsigned long port, const void *addr, unsigned long count 
{

	const u32 *buf = addr;



	if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {

		volatile u32 *p = (volatile u32 *)PCI_IOMAP(port);

	if (is_pci_ioaddr(port) || shifted_port(port)) {

		volatile u32 *p = (volatile u32 *)pci_ioaddr(port);



		while (count--)

			*p = *buf++;
@@ -316,8 +276,8 @@ void __iomem *hs7751rvoip_ioport_map(unsigned long port, unsigned int size) 
                return (void __iomem *)port;

	else if (unlikely(codec_port(port) && (size == 1)))

		return (void __iomem *)CODEC_IOMAP(port);

        else if (CHECK_SH7751_PCIIO(port))

                return (void __iomem *)PCI_IOMAP(port);

        else if (is_pci_ioaddr(port))

                return (void __iomem *)pci_ioaddr(port);



        return (void __iomem *)port2adr(port);

}

arch/sh/boards/renesas/r7780rp/io.c

+33 −70
Original line number Diff line number Diff line 
/*

 * linux/arch/sh/kernel/io_r7780rp.c

 *

 * Copyright (C) 2001  Ian da Silva, Jeremy Siegel

 * Based largely on io_se.c.

 *
@@ -10,37 +8,13 @@ 
 * placeholder code from io_r7780rp.c left in with the

 * expectation of later SuperIO and PCMCIA access.

 */



#include <linux/pci.h>

#include <linux/kernel.h>

#include <linux/types.h>

#include <asm/r7780rp/r7780rp.h>

#include <asm/addrspace.h>

#include <asm/io.h>



#include <linux/module.h>

#include <linux/pci.h>

#include "../../../drivers/pci/pci-sh7780.h"



/*

 * The 7780 R7780RP-1 uses the built-in PCI controller (PCIC)

 * of the 7780 processor, and has a SuperIO accessible via the PCI.

 * The board also includes a PCMCIA controller on its memory bus,

 * like the other Solution Engine boards.

 */



#define	SH7780_PCIIOBR_MASK	0xFFFC0000	/* IO Space Mask */

#define PCIIOBR		(volatile long *)PCI_REG(SH7780_PCIIOBR)

#define PCIMBR          (volatile long *)PCI_REG(SH7780_PCIMBR)

#define PCI_IO_AREA	SH7780_PCI_IO_BASE

#define PCI_MEM_AREA	SH7780_PCI_CONFIG_BASE



#define PCI_IOMAP(adr)	(PCI_IO_AREA + (adr & ~SH7780_PCIIOBR_MASK))



static inline void delay(void)

{

	ctrl_inw(0xa0000000);

}



static inline unsigned long port2adr(unsigned int port)

{

	if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
@@ -78,17 +52,6 @@ static inline int shifted_port(unsigned long port) 
		return 1;

}



/* In case someone configures the kernel w/o PCI support: in that */

/* scenario, don't ever bother to check for PCI-window addresses */



/* NOTE: WINDOW CHECK MAY BE A BIT OFF, HIGH PCIBIOS_MIN_IO WRAPS? */

#if defined(CONFIG_PCI)

#define CHECK_SH7780_PCIIO(port) \

  ((port >= PCIBIOS_MIN_IO) && (port < (PCIBIOS_MIN_IO + SH7780_PCI_IO_SIZE)))

#else

#define CHECK_SH7780_PCIIO(port) (0)

#endif



#if defined(CONFIG_NE2000) || defined(CONFIG_NE2000_MODULE)

#define CHECK_AX88796L_PORT(port) \

  ((port >= AX88796L_IO_BASE) && (port < (AX88796L_IO_BASE+0x20)))
@@ -109,8 +72,8 @@ u8 r7780rp_inb(unsigned long port) 
		return ctrl_inw(port88796l(port, 0)) & 0xff;

	else if (PXSEG(port))

		return ctrl_inb(port);

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port))

		return ctrl_inb(PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		return ctrl_inb(pci_ioaddr(port));



	return ctrl_inw(port2adr(port)) & 0xff;

}
@@ -123,12 +86,12 @@ u8 r7780rp_inb_p(unsigned long port) 
		v = ctrl_inw(port88796l(port, 0)) & 0xff;

	else if (PXSEG(port))

		v = ctrl_inb(port);

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port))

		v = ctrl_inb(PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		v = ctrl_inb(pci_ioaddr(port));

	else

		v = ctrl_inw(port2adr(port)) & 0xff;



	delay();

	ctrl_delay();



	return v;

}
@@ -139,8 +102,8 @@ u16 r7780rp_inw(unsigned long port) 
		maybebadio(port);

	else if (PXSEG(port))

		return ctrl_inw(port);

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port))

		return ctrl_inw(PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		return ctrl_inw(pci_ioaddr(port));

	else

		maybebadio(port);
@@ -153,8 +116,8 @@ u32 r7780rp_inl(unsigned long port) 
		maybebadio(port);

	else if (PXSEG(port))

		return ctrl_inl(port);

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port))

		return ctrl_inl(PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		return ctrl_inl(pci_ioaddr(port));

	else

		maybebadio(port);
@@ -167,8 +130,8 @@ void r7780rp_outb(u8 value, unsigned long port) 
		ctrl_outw(value, port88796l(port, 0));

	else if (PXSEG(port))

		ctrl_outb(value, port);

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port))

		ctrl_outb(value, PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		ctrl_outb(value, pci_ioaddr(port));

	else

		ctrl_outw(value, port2adr(port));

}
@@ -179,12 +142,12 @@ void r7780rp_outb_p(u8 value, unsigned long port) 
		ctrl_outw(value, port88796l(port, 0));

	else if (PXSEG(port))

		ctrl_outb(value, port);

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port))

		ctrl_outb(value, PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		ctrl_outb(value, pci_ioaddr(port));

	else

		ctrl_outw(value, port2adr(port));



	delay();

	ctrl_delay();

}



void r7780rp_outw(u16 value, unsigned long port)
@@ -193,8 +156,8 @@ void r7780rp_outw(u16 value, unsigned long port) 
		maybebadio(port);

	else if (PXSEG(port))

		ctrl_outw(value, port);

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port))

		ctrl_outw(value, PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		ctrl_outw(value, pci_ioaddr(port));

	else

		maybebadio(port);

}
@@ -205,8 +168,8 @@ void r7780rp_outl(u32 value, unsigned long port) 
		maybebadio(port);

	else if (PXSEG(port))

		ctrl_outl(value, port);

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port))

		ctrl_outl(value, PCI_IOMAP(port));

	else if (is_pci_ioaddr(port) || shifted_port(port))

		ctrl_outl(value, pci_ioaddr(port));

	else

		maybebadio(port);

}
@@ -223,8 +186,8 @@ void r7780rp_insb(unsigned long port, void *dst, unsigned long count) 
	} else if (PXSEG(port)) {

		while (count--)

			*buf++ = *(volatile u8 *)port;

	} else if (CHECK_SH7780_PCIIO(port) || shifted_port(port)) {

		volatile u8 *bp = (volatile u8 *)PCI_IOMAP(port);

	} else if (is_pci_ioaddr(port) || shifted_port(port)) {

		volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);



		while (count--)

			*buf++ = *bp;
@@ -244,8 +207,8 @@ void r7780rp_insw(unsigned long port, void *dst, unsigned long count) 
		p = (volatile u16 *)port88796l(port, 1);

	else if (PXSEG(port))

		p = (volatile u16 *)port;

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port))

		p = (volatile u16 *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port) || shifted_port(port))

		p = (volatile u16 *)pci_ioaddr(port);

	else

		p = (volatile u16 *)port2adr(port);
@@ -259,8 +222,8 @@ void r7780rp_insl(unsigned long port, void *dst, unsigned long count) 


	if (CHECK_AX88796L_PORT(port))

		maybebadio(port);

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port)) {

		volatile u32 *p = (volatile u32 *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port) || shifted_port(port)) {

		volatile u32 *p = (volatile u32 *)pci_ioaddr(port);



		while (count--)

			*buf++ = *p;
@@ -280,8 +243,8 @@ void r7780rp_outsb(unsigned long port, const void *src, unsigned long count) 
	} else if (PXSEG(port))

		while (count--)

			ctrl_outb(*buf++, port);

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port)) {

		volatile u8 *bp = (volatile u8 *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port) || shifted_port(port)) {

		volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);



		while (count--)

			*bp = *buf++;
@@ -301,8 +264,8 @@ void r7780rp_outsw(unsigned long port, const void *src, unsigned long count) 
		p = (volatile u16 *)port88796l(port, 1);

	else if (PXSEG(port))

		p = (volatile u16 *)port;

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port))

		p = (volatile u16 *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port) || shifted_port(port))

		p = (volatile u16 *)pci_ioaddr(port);

	else

		p = (volatile u16 *)port2adr(port);
@@ -316,8 +279,8 @@ void r7780rp_outsl(unsigned long port, const void *src, unsigned long count) 


	if (CHECK_AX88796L_PORT(port))

		maybebadio(port);

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port)) {

		volatile u32 *p = (volatile u32 *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port) || shifted_port(port)) {

		volatile u32 *p = (volatile u32 *)pci_ioaddr(port);



		while (count--)

			*p = *buf++;
@@ -331,8 +294,8 @@ void __iomem *r7780rp_ioport_map(unsigned long port, unsigned int size) 
		return (void __iomem *)port88796l(port, size > 1);

	else if (PXSEG(port))

		return (void __iomem *)port;

	else if (CHECK_SH7780_PCIIO(port) || shifted_port(port))

		return (void __iomem *)PCI_IOMAP(port);

	else if (is_pci_ioaddr(port) || shifted_port(port))

		return (void __iomem *)pci_ioaddr(port);



	return (void __iomem *)port2adr(port);

}