f5e706ad88
With this commit all sparc64 header files are moved to asm-sparc.
The remaining files (71 files) were too different to be trivially
merged so divide them up in a _32.h and a _64.h file which
are both included from the file with no bit size.
The following script were used:
cd include
FILES=`wc -l asm-sparc64/*h | grep -v '^ 1' | cut -b 20-`
for FILE in ${FILES}; do
echo $FILE:
BASE=`echo $FILE | cut -d '.' -f 1`
FN32=${BASE}_32.h
FN64=${BASE}_64.h
GUARD=___ASM_SPARC_`echo $BASE | tr '-' '_' | tr [:lower:] [:upper:]`_H
git mv asm-sparc/$FILE asm-sparc/$FN32
git mv asm-sparc64/$FILE asm-sparc/$FN64
echo git mv done
printf "#ifndef %s\n" $GUARD > asm-sparc/$FILE
printf "#define %s\n" $GUARD >> asm-sparc/$FILE
printf "#if defined(__sparc__) && defined(__arch64__)\n" >> asm-sparc/$FILE
printf "#include <asm-sparc/%s>\n" $FN64 >> asm-sparc/$FILE
printf "#else\n" >> asm-sparc/$FILE
printf "#include <asm-sparc/%s>\n" $FN32 >> asm-sparc/$FILE
printf "#endif\n" >> asm-sparc/$FILE
printf "#endif\n" >> asm-sparc/$FILE
git add asm-sparc/$FILE
echo new file done
printf "#include <asm-sparc/%s>\n" $FILE > asm-sparc64/$FILE
git add asm-sparc64/$FILE
echo sparc64 file done
done
The guard contains three '_' to avoid conflict with existing guards.
In additing the two Kbuild files are emptied to avoid breaking
headers_* targets.
We will reintroduce the exported header files when the necessary
kbuild changes are merged.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
96 lines
2.0 KiB
C
96 lines
2.0 KiB
C
/* ide.h: SPARC PCI specific IDE glue.
|
|
*
|
|
* Copyright (C) 1997 David S. Miller (davem@davemloft.net)
|
|
* Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be)
|
|
* Adaptation from sparc64 version to sparc by Pete Zaitcev.
|
|
*/
|
|
|
|
#ifndef _SPARC_IDE_H
|
|
#define _SPARC_IDE_H
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <asm/pgtable.h>
|
|
#include <asm/io.h>
|
|
#include <asm/psr.h>
|
|
|
|
#undef MAX_HWIFS
|
|
#define MAX_HWIFS 2
|
|
|
|
#define __ide_insl(data_reg, buffer, wcount) \
|
|
__ide_insw(data_reg, buffer, (wcount)<<1)
|
|
#define __ide_outsl(data_reg, buffer, wcount) \
|
|
__ide_outsw(data_reg, buffer, (wcount)<<1)
|
|
|
|
/* On sparc, I/O ports and MMIO registers are accessed identically. */
|
|
#define __ide_mm_insw __ide_insw
|
|
#define __ide_mm_insl __ide_insl
|
|
#define __ide_mm_outsw __ide_outsw
|
|
#define __ide_mm_outsl __ide_outsl
|
|
|
|
static inline void __ide_insw(unsigned long port,
|
|
void *dst,
|
|
unsigned long count)
|
|
{
|
|
volatile unsigned short *data_port;
|
|
/* unsigned long end = (unsigned long)dst + (count << 1); */ /* P3 */
|
|
u16 *ps = dst;
|
|
u32 *pi;
|
|
|
|
data_port = (volatile unsigned short *)port;
|
|
|
|
if(((unsigned long)ps) & 0x2) {
|
|
*ps++ = *data_port;
|
|
count--;
|
|
}
|
|
pi = (u32 *)ps;
|
|
while(count >= 2) {
|
|
u32 w;
|
|
|
|
w = (*data_port) << 16;
|
|
w |= (*data_port);
|
|
*pi++ = w;
|
|
count -= 2;
|
|
}
|
|
ps = (u16 *)pi;
|
|
if(count)
|
|
*ps++ = *data_port;
|
|
|
|
/* __flush_dcache_range((unsigned long)dst, end); */ /* P3 see hme */
|
|
}
|
|
|
|
static inline void __ide_outsw(unsigned long port,
|
|
const void *src,
|
|
unsigned long count)
|
|
{
|
|
volatile unsigned short *data_port;
|
|
/* unsigned long end = (unsigned long)src + (count << 1); */
|
|
const u16 *ps = src;
|
|
const u32 *pi;
|
|
|
|
data_port = (volatile unsigned short *)port;
|
|
|
|
if(((unsigned long)src) & 0x2) {
|
|
*data_port = *ps++;
|
|
count--;
|
|
}
|
|
pi = (const u32 *)ps;
|
|
while(count >= 2) {
|
|
u32 w;
|
|
|
|
w = *pi++;
|
|
*data_port = (w >> 16);
|
|
*data_port = w;
|
|
count -= 2;
|
|
}
|
|
ps = (const u16 *)pi;
|
|
if(count)
|
|
*data_port = *ps;
|
|
|
|
/* __flush_dcache_range((unsigned long)src, end); */ /* P3 see hme */
|
|
}
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _SPARC_IDE_H */
|