Minix/rpi_b
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

_MINIX_SYSTEM - fixes for in-minix crossbuild

Browse Source 
. define _MINIX_SYSTEM for all system code from minix.service.mk
	. hide some system-level declarations and definitions
	  behind _MINIX_SYSTEM to cleanly fix host tool build problems on
	  Minix (such as: NONE being defined and paddr_t being used but not
	  declared)
	. the similar definition _SYSTEM is unsuitable as it changes the
	  values of errno definitions

Change-Id: I407de79e2575115243a074b16e79546a279cfa3e
This commit is contained in:
Ben Gras
2014-03-05 12:21:55 +01:00
committed by Lionel Sambuc
parent aa6ee31737
commit 3f38115c7b
38 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/i386/include/multiboot.h
View File

@@ -43,9 +43,12 @@
#define MULTIBOOT_HEADER_HAS_VBE 0x00000004
#define MULTIBOOT_HEADER_HAS_ADDR 0x00010000
#if defined(__minix) && !defined(__ASSEMBLY__)
#if defined(__minix) && !defined(__ASSEMBLY__) && (defined(_MINIX_SYSTEM) || defined(_STANDALONE))
#if !defined(_LOCORE)
#include <machine/types.h>
struct multiboot_header {
uint32_t mh_magic;
uint32_t mh_flags;
@@ -73,7 +76,7 @@ struct multiboot_header {
extern struct multiboot_header *Multiboot_Header;
#endif /* !defined(_LOCORE) && defined(_KERNEL) */
#endif /* defined(__minix) && !defined(__ASSEMBLY__) */
#endif /* defined(__minix) && !defined(__ASSEMBLY__) && (defined(_MINIX_SYSTEM) || defined(_STANDALONE))*/
/* --------------------------------------------------------------------- */
@@ -94,7 +97,7 @@ extern struct multiboot_header *Multiboot_Header;
#define MULTIBOOT_INFO_HAS_APM_TABLE 0x00000400
#define MULTIBOOT_INFO_HAS_VBE 0x00000800
#if defined(__minix) && !defined(__ASSEMBLY__)
#if defined(__minix) && !defined(__ASSEMBLY__) && (defined(_MINIX_SYSTEM) || defined(_STANDALONE))
#if !defined(_LOCORE)
struct multiboot_info {
@@ -197,7 +200,7 @@ struct multiboot_module {
#endif /* !defined(_LOCORE) */
#endif /* defined(__minix) && !defined(__ASSEMBLY__) */
#endif /* defined(__minix) && !defined(__ASSEMBLY__) && (defined(_MINIX_SYSTEM) || defined(_STANDALONE))*/
#if defined(__minix)
@@ -240,4 +243,4 @@ bool multiboot_ksyms_addsyms_elf(void);
/* --------------------------------------------------------------------- */
#endif /* _MACHINE_MULTIBOOT_H */
#endif /* _MACHINE_MULTIBOOT_H */

4
sys/sys/mman.h
View File

@@ -200,14 +200,14 @@ void * mremap(void *, size_t, void *, size_t, int);
#endif
int posix_madvise(void *, size_t, int);
#if defined(__minix)
#if defined(__minix) && defined(_MINIX_SYSTEM)
#include <minix/endpoint.h>
void * vm_remap(endpoint_t d, endpoint_t s, void *da, void *sa, size_t si);
void * vm_remap_ro(endpoint_t d, endpoint_t s, void *da, void *sa, size_t si);
int vm_unmap(endpoint_t endpt, void *addr);
unsigned long vm_getphys(endpoint_t endpt, void *addr);
u8_t vm_getrefcount(endpoint_t endpt, void *addr);
#endif /* defined(__minix) */
#endif /* defined(__minix) && defined(_MINIX_SYSTEM) */
__END_DECLS