linux-libc-headers/trunk/include: asm-sh/cacheflush.h
asm-sparc64/upa.h asm-v850/v850e_cache.h linux...
mmazur
cvs at pld-linux.org
Tue Jul 5 23:20:40 CEST 2005
Author: mmazur
Date: Tue Jul 5 23:20:36 2005
New Revision: 6207
Modified:
linux-libc-headers/trunk/include/asm-sh/cacheflush.h
linux-libc-headers/trunk/include/asm-sparc64/upa.h
linux-libc-headers/trunk/include/asm-v850/v850e_cache.h
linux-libc-headers/trunk/include/linux/soundcard.h
Log:
- removing kernel parts
Modified: linux-libc-headers/trunk/include/asm-sh/cacheflush.h
==============================================================================
--- linux-libc-headers/trunk/include/asm-sh/cacheflush.h (original)
+++ linux-libc-headers/trunk/include/asm-sh/cacheflush.h Tue Jul 5 23:20:36 2005
@@ -1,31 +1,3 @@
#ifndef __ASM_SH_CACHEFLUSH_H
#define __ASM_SH_CACHEFLUSH_H
-#ifdef __KERNEL__
-
-#include <asm/cpu/cacheflush.h>
-
-/* Flush (write-back only) a region (smaller than a page) */
-extern void __flush_wback_region(void *start, int size);
-/* Flush (write-back & invalidate) a region (smaller than a page) */
-extern void __flush_purge_region(void *start, int size);
-/* Flush (invalidate only) a region (smaller than a page) */
-extern void __flush_invalidate_region(void *start, int size);
-
-#define flush_cache_vmap(start, end) flush_cache_all()
-#define flush_cache_vunmap(start, end) flush_cache_all()
-
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
- do { \
- flush_cache_page(vma, vaddr, page_to_pfn(page));\
- memcpy(dst, src, len); \
- flush_icache_user_range(vma, page, vaddr, len); \
- } while (0)
-
-#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
- do { \
- flush_cache_page(vma, vaddr, page_to_pfn(page));\
- memcpy(dst, src, len); \
- } while (0)
-
-#endif /* __KERNEL__ */
#endif /* __ASM_SH_CACHEFLUSH_H */
Modified: linux-libc-headers/trunk/include/asm-sparc64/upa.h
==============================================================================
--- linux-libc-headers/trunk/include/asm-sparc64/upa.h (original)
+++ linux-libc-headers/trunk/include/asm-sparc64/upa.h Tue Jul 5 23:20:36 2005
@@ -22,88 +22,4 @@
#define UPA_PORTID_UPACAP 0x00000000001f0000 /* UPA capabilities of mod */
#define UPA_PORTID_ID 0x000000000000ffff /* Module Identification bits */
-/* UPA I/O space accessors */
-#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
-static __inline__ unsigned char _upa_readb(unsigned long addr)
-{
- unsigned char ret;
-
- __asm__ __volatile__("lduba\t[%1] %2, %0\t/* upa_readb */"
- : "=r" (ret)
- : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-
- return ret;
-}
-
-static __inline__ unsigned short _upa_readw(unsigned long addr)
-{
- unsigned short ret;
-
- __asm__ __volatile__("lduha\t[%1] %2, %0\t/* upa_readw */"
- : "=r" (ret)
- : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-
- return ret;
-}
-
-static __inline__ unsigned int _upa_readl(unsigned long addr)
-{
- unsigned int ret;
-
- __asm__ __volatile__("lduwa\t[%1] %2, %0\t/* upa_readl */"
- : "=r" (ret)
- : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-
- return ret;
-}
-
-static __inline__ unsigned long _upa_readq(unsigned long addr)
-{
- unsigned long ret;
-
- __asm__ __volatile__("ldxa\t[%1] %2, %0\t/* upa_readq */"
- : "=r" (ret)
- : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-
- return ret;
-}
-
-static __inline__ void _upa_writeb(unsigned char b, unsigned long addr)
-{
- __asm__ __volatile__("stba\t%0, [%1] %2\t/* upa_writeb */"
- : /* no outputs */
- : "r" (b), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-}
-
-static __inline__ void _upa_writew(unsigned short w, unsigned long addr)
-{
- __asm__ __volatile__("stha\t%0, [%1] %2\t/* upa_writew */"
- : /* no outputs */
- : "r" (w), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-}
-
-static __inline__ void _upa_writel(unsigned int l, unsigned long addr)
-{
- __asm__ __volatile__("stwa\t%0, [%1] %2\t/* upa_writel */"
- : /* no outputs */
- : "r" (l), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-}
-
-static __inline__ void _upa_writeq(unsigned long q, unsigned long addr)
-{
- __asm__ __volatile__("stxa\t%0, [%1] %2\t/* upa_writeq */"
- : /* no outputs */
- : "r" (q), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-}
-
-#define upa_readb(__addr) (_upa_readb((unsigned long)(__addr)))
-#define upa_readw(__addr) (_upa_readw((unsigned long)(__addr)))
-#define upa_readl(__addr) (_upa_readl((unsigned long)(__addr)))
-#define upa_readq(__addr) (_upa_readq((unsigned long)(__addr)))
-#define upa_writeb(__b, __addr) (_upa_writeb((__b), (unsigned long)(__addr)))
-#define upa_writew(__w, __addr) (_upa_writew((__w), (unsigned long)(__addr)))
-#define upa_writel(__l, __addr) (_upa_writel((__l), (unsigned long)(__addr)))
-#define upa_writeq(__q, __addr) (_upa_writeq((__q), (unsigned long)(__addr)))
-#endif /* __KERNEL__ && !__ASSEMBLY__ */
-
#endif /* !(_SPARC64_UPA_H) */
Modified: linux-libc-headers/trunk/include/asm-v850/v850e_cache.h
==============================================================================
--- linux-libc-headers/trunk/include/asm-v850/v850e_cache.h (original)
+++ linux-libc-headers/trunk/include/asm-v850/v850e_cache.h Tue Jul 5 23:20:36 2005
@@ -39,10 +39,5 @@
#define L1_CACHE_BYTES V850E_CACHE_LINE_SIZE
-#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
-/* Set caching params via the BHC, ICC, and DCC registers. */
-void v850e_cache_enable (__u16 bhc, __u16 icc, __u16 dcc);
-#endif /* __KERNEL__ && !__ASSEMBLY__ */
-
#endif /* __V850_V850E_CACHE_H__ */
Modified: linux-libc-headers/trunk/include/linux/soundcard.h
==============================================================================
--- linux-libc-headers/trunk/include/linux/soundcard.h (original)
+++ linux-libc-headers/trunk/include/linux/soundcard.h Tue Jul 5 23:20:36 2005
@@ -40,11 +40,7 @@
#include <linux/ioctl.h>
/* Endian macros. */
-#ifdef __KERNEL__
-# include <asm/byteorder.h>
-#else
# include <endian.h>
-#endif
/*
* Supported card ID numbers (Should be somewhere else?)
@@ -190,15 +186,7 @@
#include <linux/patchkey.h>
#undef _LINUX_PATCHKEY_H_INDIRECT
-#if defined(__KERNEL__)
-# if defined(__BIG_ENDIAN)
-# define AFMT_S16_NE AFMT_S16_BE
-# elif defined(__LITTLE_ENDIAN)
-# define AFMT_S16_NE AFMT_S16_LE
-# else
-# error "could not determine byte order"
-# endif
-#elif defined(__BYTE_ORDER)
+#if defined(__BYTE_ORDER)
# if __BYTE_ORDER == __BIG_ENDIAN
# define AFMT_S16_NE AFMT_S16_BE
# elif __BYTE_ORDER == __LITTLE_ENDIAN
More information about the pld-cvs-commit
mailing list