change include/arch/ia32/arch/api/objecttype.h to match the libsel4 equivalent

This commit is contained in:
Anna Lyons 2015-05-15 10:39:36 +10:00
parent b97c75ffb4
commit f5afc2d917
2 changed files with 12 additions and 0 deletions

View file

@ -11,6 +11,10 @@
#ifndef __ARCH_OBJECT_TYPE_H
#define __ARCH_OBJECT_TYPE_H
#ifdef HAVE_AUTOCONF
#include <autoconf.h>
#endif /* HAVE_AUTOCONF */
typedef enum _object {
seL4_IA32_4K = seL4_NonArchObjectTypeCount,
seL4_IA32_LargePage,
@ -24,4 +28,10 @@ typedef enum _object {
} seL4_ArchObjectType;
typedef uint32_t object_t;
/* Previously frame types were explcitly 4K and 4M. If not PAE
* we assume legacy environment and emulate old definitions */
#ifndef CONFIG_PAE_PAGING
#define seL4_IA32_4M seL4_IA32_LargePage
#endif
#endif

View file

@ -11,7 +11,9 @@
#ifndef __ARCH_OBJECT_TYPE_H
#define __ARCH_OBJECT_TYPE_H
#ifdef HAVE_AUTOCONF
#include <autoconf.h>
#endif /* HAVE_AUTOCONF */
typedef enum _object {
seL4_IA32_4K = seL4_NonArchObjectTypeCount,