diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-10-22 14:21:28 +0200 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-10-22 14:21:28 +0200 |
commit | e2a7b79cfc63c8a5bdafb6f333fedf35b6b8a380 (patch) | |
tree | 693e4c786169ac0a611bd4fde64401590fbeb3f8 /include | |
parent | 37e96f83bca38c26179b38d0130b0462ae09bb50 (diff) | |
download | barebox-e2a7b79cfc63c8a5bdafb6f333fedf35b6b8a380.tar.gz barebox-e2a7b79cfc63c8a5bdafb6f333fedf35b6b8a380.tar.xz |
[SANDBOX] move include/asm-sandbox to arch/arm/include/sandbox
Move platform independent header files to arch/sandbox/include/asm, leaving
those in asm/arch*.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-sandbox/bitops.h | 15 | ||||
-rw-r--r-- | include/asm-sandbox/byteorder.h | 8 | ||||
-rw-r--r-- | include/asm-sandbox/common.h | 6 | ||||
-rw-r--r-- | include/asm-sandbox/elf.h | 2 | ||||
-rw-r--r-- | include/asm-sandbox/global_data.h | 30 | ||||
-rw-r--r-- | include/asm-sandbox/posix_types.h | 80 | ||||
-rw-r--r-- | include/asm-sandbox/processor.h | 29 | ||||
-rw-r--r-- | include/asm-sandbox/ptrace.h | 1 | ||||
-rw-r--r-- | include/asm-sandbox/string.h | 1 | ||||
-rw-r--r-- | include/asm-sandbox/types.h | 58 | ||||
-rw-r--r-- | include/asm-sandbox/u-boot.h | 1 |
11 files changed, 0 insertions, 231 deletions
diff --git a/include/asm-sandbox/bitops.h b/include/asm-sandbox/bitops.h deleted file mode 100644 index 94646d4d0d..0000000000 --- a/include/asm-sandbox/bitops.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _SANDBOX_BITOPS_H -#define _SANDBOX_BITOPS_H - -/* nothing but the defaults.. */ -#include <asm-generic/bitops/__ffs.h> -#include <asm-generic/bitops/__fls.h> -#include <asm-generic/bitops/ffs.h> -#include <asm-generic/bitops/fls.h> -#include <asm-generic/bitops/ffz.h> -#include <asm-generic/bitops/find.h> -#include <asm-generic/bitops/fls64.h> -#include <asm-generic/bitops/hweight.h> -#include <asm-generic/bitops/ops.h> - -#endif diff --git a/include/asm-sandbox/byteorder.h b/include/asm-sandbox/byteorder.h deleted file mode 100644 index 37316f2371..0000000000 --- a/include/asm-sandbox/byteorder.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _I386_BYTEORDER_H -#define _I386_BYTEORDER_H - -#include <asm/types.h> - -#include <linux/byteorder/little_endian.h> - -#endif /* _I386_BYTEORDER_H */ diff --git a/include/asm-sandbox/common.h b/include/asm-sandbox/common.h deleted file mode 100644 index 9b8bd2d94c..0000000000 --- a/include/asm-sandbox/common.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef ASM_COMMON_H -#define ASM_COMMON_H - -#define ARCH_HAS_CTRLC - -#endif /* ASM_COMMON_H */ diff --git a/include/asm-sandbox/elf.h b/include/asm-sandbox/elf.h deleted file mode 100644 index b60d24890c..0000000000 --- a/include/asm-sandbox/elf.h +++ /dev/null @@ -1,2 +0,0 @@ - -/* nothing yet */ diff --git a/include/asm-sandbox/global_data.h b/include/asm-sandbox/global_data.h deleted file mode 100644 index 51d9405d65..0000000000 --- a/include/asm-sandbox/global_data.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * (C) Copyright 2002 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * 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 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; 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 - */ - -#ifndef __ASM_GBL_DATA_H -#define __ASM_GBL_DATA_H -typedef struct global_data gd_t; - -#define DECLARE_GLOBAL_DATA_PTR - -#endif /* __ASM_GBL_DATA_H */ diff --git a/include/asm-sandbox/posix_types.h b/include/asm-sandbox/posix_types.h deleted file mode 100644 index 5dcc842ab7..0000000000 --- a/include/asm-sandbox/posix_types.h +++ /dev/null @@ -1,80 +0,0 @@ -#ifndef __ARCH_I386_POSIX_TYPES_H -#define __ARCH_I386_POSIX_TYPES_H - -/* - * This file is generally used by user-level software, so you need to - * be a little careful about namespace pollution etc. Also, we cannot - * assume GCC is being used. - */ - -typedef unsigned short __kernel_dev_t; -typedef unsigned long __kernel_ino_t; -typedef unsigned short __kernel_mode_t; -typedef unsigned short __kernel_nlink_t; -typedef long __kernel_off_t; -typedef int __kernel_pid_t; -typedef unsigned short __kernel_ipc_pid_t; -typedef unsigned short __kernel_uid_t; -typedef unsigned short __kernel_gid_t; -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef int __kernel_ptrdiff_t; -typedef long __kernel_time_t; -typedef long __kernel_suseconds_t; -typedef long __kernel_clock_t; -typedef int __kernel_daddr_t; -typedef char * __kernel_caddr_t; -typedef unsigned short __kernel_uid16_t; -typedef unsigned short __kernel_gid16_t; -typedef unsigned int __kernel_uid32_t; -typedef unsigned int __kernel_gid32_t; - -typedef unsigned short __kernel_old_uid_t; -typedef unsigned short __kernel_old_gid_t; - -#ifdef __GNUC__ -typedef long long __kernel_loff_t; -#endif - -typedef struct { -#if defined(__KERNEL__) || defined(__USE_ALL) - int val[2]; -#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ - int __val[2]; -#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ -} __kernel_fsid_t; - -#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) - -#undef __FD_SET -#define __FD_SET(fd,fdsetp) \ - __asm__ __volatile__("btsl %1,%0": \ - "=m" (*(__kernel_fd_set *) (fdsetp)):"r" ((int) (fd))) - -#undef __FD_CLR -#define __FD_CLR(fd,fdsetp) \ - __asm__ __volatile__("btrl %1,%0": \ - "=m" (*(__kernel_fd_set *) (fdsetp)):"r" ((int) (fd))) - -#undef __FD_ISSET -#define __FD_ISSET(fd,fdsetp) (__extension__ ({ \ - unsigned char __result; \ - __asm__ __volatile__("btl %1,%2 ; setb %0" \ - :"=q" (__result) :"r" ((int) (fd)), \ - "m" (*(__kernel_fd_set *) (fdsetp))); \ - __result; })) - -#undef __FD_ZERO -#define __FD_ZERO(fdsetp) \ -do { \ - int __d0, __d1; \ - __asm__ __volatile__("cld ; rep ; stosl" \ - :"=m" (*(__kernel_fd_set *) (fdsetp)), \ - "=&c" (__d0), "=&D" (__d1) \ - :"a" (0), "1" (__FDSET_LONGS), \ - "2" ((__kernel_fd_set *) (fdsetp)) : "memory"); \ -} while (0) - -#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ - -#endif diff --git a/include/asm-sandbox/processor.h b/include/asm-sandbox/processor.h deleted file mode 100644 index 5dedba82ca..0000000000 --- a/include/asm-sandbox/processor.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * (C) Copyright 2002 - * Daniel Engström, Omicron Ceti AB, daniel@omicron.se - * - * See file CREDITS for list of people who contributed to this - * project. - * - * 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 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; 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 - */ - -#ifndef __ASM_PROCESSOR_H_ -#define __ASM_PROCESSOR_H_ 1 -/* Currently this header is unused in the i386 port - * but some generic files #include <asm/processor.h> - * so this file is a placeholder. */ -#endif diff --git a/include/asm-sandbox/ptrace.h b/include/asm-sandbox/ptrace.h deleted file mode 100644 index 2997587d82..0000000000 --- a/include/asm-sandbox/ptrace.h +++ /dev/null @@ -1 +0,0 @@ -/* dummy */ diff --git a/include/asm-sandbox/string.h b/include/asm-sandbox/string.h deleted file mode 100644 index 2997587d82..0000000000 --- a/include/asm-sandbox/string.h +++ /dev/null @@ -1 +0,0 @@ -/* dummy */ diff --git a/include/asm-sandbox/types.h b/include/asm-sandbox/types.h deleted file mode 100644 index a9872194d9..0000000000 --- a/include/asm-sandbox/types.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef __ASM_I386_TYPES_H -#define __ASM_I386_TYPES_H - -#ifdef __x86_64__ -/* - * This is used in dlmalloc. On X86_64 we need it to be - * 64 bit - */ -#define INTERNAL_SIZE_T unsigned long -#endif - -typedef unsigned short umode_t; - -/* - * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the - * header files exported to user space - */ - -typedef __signed__ char __s8; -typedef unsigned char __u8; - -typedef __signed__ short __s16; -typedef unsigned short __u16; - -typedef __signed__ int __s32; -typedef unsigned int __u32; - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -typedef __signed__ long long __s64; -typedef unsigned long long __u64; -#endif - -/* - * These aren't exported outside the kernel to avoid name space clashes - */ -#ifdef __KERNEL__ - -typedef signed char s8; -typedef unsigned char u8; - -typedef signed short s16; -typedef unsigned short u16; - -typedef signed int s32; -typedef unsigned int u32; - -typedef signed long long s64; -typedef unsigned long long u64; - -#define BITS_PER_LONG 32 - -/* Dma addresses are 32-bits wide. */ - -typedef u32 dma_addr_t; - -#endif /* __KERNEL__ */ - -#endif diff --git a/include/asm-sandbox/u-boot.h b/include/asm-sandbox/u-boot.h deleted file mode 100644 index 2997587d82..0000000000 --- a/include/asm-sandbox/u-boot.h +++ /dev/null @@ -1 +0,0 @@ -/* dummy */ |