secc
/
l4ka-pistachio
mirror of https://github.com/l4ka/pistachio.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

- platform/pc99 is the wrong location for IO-fpage related code. With the 

new x32/x64 merge, files can now be put to a more appropriate location
This commit is contained in:
Jan Stoess 2008-05-16 11:24:35 +02:00
parent d0f325c9ed
commit 215a130460
14 changed files with 53 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/src/glue/v4-x86/Makeconf
View File

@ -1,6 +1,6 @@
######################################################################
##
## Copyright (C) 2007, Karlsruhe University
## Copyright (C) 2007-2008, Karlsruhe University
##
## File path: glue/v4-x86/Makeconf
##
@ -38,3 +38,8 @@ SOURCES += src/glue/v4-x86/timer-apic.cc
else
SOURCES += src/glue/v4-x86/timer.cc
endif
ifeq ("$(CONFIG_X86_IO_FLEXPAGES)","y")
SOURCES += $(addprefix src/glue/v4-x86/, mdb_io.cc vrt_io.cc io_space.cc)
endif

2
kernel/src/glue/v4-x86/exception.cc
View File

@ -28,7 +28,7 @@ DECLARE_TRACEPOINT (X86_SEGRELOAD);
DECLARE_TRACEPOINT (X86_UD);
#if defined(CONFIG_X86_IO_FLEXPAGES)
#include INC_PLAT(io_space.h)
#include INC_GLUE(io_space.h)
#endif
#if defined(CONFIG_X86_COMPATIBILITY_MODE)

6
kernel/src/glue/v4-x86/fpage.h
View File

@ -1,8 +1,8 @@
/*********************************************************************
*
* Copyright (C) 2002-2005, Karlsruhe University
* Copyright (C) 2002-2005, 2008, Karlsruhe University
*
* File path: glue/v4-ia32/fpage.h
* File path: glue/v4-x86/fpage.h
* Description: V4 flexpages
*
* Redistribution and use in source and binary forms, with or without
@ -32,7 +32,7 @@
#ifndef __GLUE_V4_X86__X32__FPAGE_H__
#define __GLUE_V4_X86__X32__FPAGE_H__
#include INC_PLAT(io_fpage.h)
#include INC_GLUE(io_fpage.h)
#endif /* !__GLUE_V4_X86__X32__FPAGE_H__ */

15
kernel/src/platform/pc99/io_fpage.h → kernel/src/glue/v4-x86/io_fpage.h
View File

@ -1,8 +1,8 @@
/*********************************************************************
*
* Copyright (C) 2005-2006, Karlsruhe University
* Copyright (C) 2005-2006, 2008, Karlsruhe University
*
* File path: platform/pc99/io_fpage.h
* File path: glue/v4-x86/io_fpage.h
* Description: IO fpage declaration
*
* Redistribution and use in source and binary forms, with or without
@ -29,12 +29,8 @@
* $Id: io_fpage.h,v 1.5 2006/02/21 08:43:57 stoess Exp $
*
********************************************************************/
#ifndef __PLATFORM__PC99__IO_FPAGE_H__
#define __PLATFORM__PC99__IO_FPAGE_H__
#ifndef __GLUE__V4_X86__IO_FPAGE_H__
#define __GLUE__V4_X86__IO_FPAGE_H__
#if !defined(CONFIG_X86_IO_FLEXPAGES)
#include INC_API(generic-archfpage.h)
@ -178,4 +174,5 @@ public:
};
#endif /* !defined(CONFIG_X86_IO_FLEXPAGES) */
#endif /* !__PLATFORM__PC99__IO_FPAGE_H__ */
#endif /* !__GLUE__V4_X86__IO_FPAGE_H__ */

6
kernel/src/platform/pc99/io_space.cc → kernel/src/glue/v4-x86/io_space.cc
View File

@ -1,8 +1,8 @@
/*********************************************************************
*
* Copyright (C) 2004-2007, Karlsruhe University
* Copyright (C) 2004-2008, Karlsruhe University
*
* File path: platform/pc99/io_space.cc
* File path: glue/v4-x86/io_space.cc
* Description: IO-Fpage implementation for IA-32
*
* Redistribution and use in source and binary forms, with or without
@ -38,7 +38,7 @@
#include INC_API(tcb.h)
#include INC_API(thread.h)
#include INC_GLUE(space.h)
#include INC_PLAT(io_space.h)
#include INC_GLUE(io_space.h)
DECLARE_TRACEPOINT (X86_IO_PORT_SPACE);

18
kernel/src/platform/pc99/io_space.h → kernel/src/glue/v4-x86/io_space.h
View File

@ -1,8 +1,8 @@
/*********************************************************************
*
* Copyright (C) 2005, 2007, Karlsruhe University
* Copyright (C) 2005, 2007-2008, Karlsruhe University
*
* File path: platform/pc99/io_space.h
* File path: glue/v4-x86/io_space.h
* Description: IO space specific declarations
*
* Redistribution and use in source and binary forms, with or without
@ -29,11 +29,8 @@
* $Id: io_space.h,v 1.3 2005/05/19 08:43:48 stoess Exp $
*
********************************************************************/
#ifndef __PLATFORM__PC99__IO_SPACE_H__
#define __PLATFORM__PC99__IO_SPACE_H__
#ifndef __GLUE__V4_X86__IO_SPACE_H__
#define __GLUE__V4_X86__IO_SPACE_H__
#if !defined(CONFIG_X86_IO_FLEXPAGES)
#include INC_API(generic-archmap.h)
@ -44,8 +41,8 @@
#include INC_API(config.h)
#include INC_API(fpage.h)
#include INC_API(ipc.h)
#include INC_PLAT(vrt_io.h)
#include INC_PLAT(mdb_io.h)
#include INC_GLUE(vrt_io.h)
#include INC_GLUE(mdb_io.h)
#define IPC_MR0_IO_PAGEFAULT ((-8UL) << 4)
@ -67,4 +64,5 @@ void set_io_bitmap(space_t *space, word_t port, word_t log2size);
#endif /* !__PLATFORM__PC99__IO_SPACE_H__ */
#endif /* !__GLUE__V4_X86__IO_SPACE_H__ */

6
kernel/src/glue/v4-x86/map.h
View File

@ -1,8 +1,8 @@
/*********************************************************************
*
* Copyright (C) 2005, 2007, Karlsruhe University
* Copyright (C) 2005, 2007-2008, Karlsruhe University
*
* File path: glue/v4-ia32/map.h
* File path: glue/v4-x86/map.h
* Description:
*
* Redistribution and use in source and binary forms, with or without
@ -32,6 +32,6 @@
#ifndef __GLUE_V4_X86__X32__MAP_H__
#define __GLUE_V4_X86__X32__MAP_H__
#include INC_PLAT(io_space.h)
#include INC_GLUE(io_space.h)
#endif /* !__GLUE_V4_X86__X32__MAP_H__ */

8
kernel/src/platform/pc99/mdb_io.cc → kernel/src/glue/v4-x86/mdb_io.cc
View File

@ -1,8 +1,8 @@
/*********************************************************************
*
* Copyright (C) 2005-2007, Karlsruhe University
* Copyright (C) 2005-2008, Karlsruhe University
*
* File path: platform/pc99/mdb_io.cc
* File path: glue/v4-x86/mdb_io.cc
* Description: IO port specific generic mappings database functions
*
* Redistribution and use in source and binary forms, with or without
@ -30,8 +30,8 @@
*
********************************************************************/
#include <vrt.h>
#include INC_PLAT(mdb_io.h)
#include INC_PLAT(io_space.h)
#include INC_GLUE(mdb_io.h)
#include INC_GLUE(io_space.h)

14
kernel/src/platform/pc99/mdb_io.h → kernel/src/glue/v4-x86/mdb_io.h
View File

@ -1,8 +1,8 @@
/*********************************************************************
*
* Copyright (C) 2005, 2007, Karlsruhe University
* Copyright (C) 2005, 2007-2008, Karlsruhe University
*
* File path: platform/pc99/mdb_io.h
* File path: glue/v4-x86/mdb_io.h
* Description: MDB for IO ports specific declarations
*
* Redistribution and use in source and binary forms, with or without
@ -29,13 +29,12 @@
* $Id: mdb_io.h,v 1.3 2007/01/08 14:08:10 skoglund Exp $
*
********************************************************************/
#ifndef __PLATFORM__PC99__MDB_IO_H__
#define __PLATFORM__PC99__MDB_IO_H__
#ifndef __GLUE__V4_X86__MDB_IO_H__
#define __GLUE__V4_X86__MDB_IO_H__
#include <mdb.h>
#include INC_GLUE(mdb.h)
#include INC_PLAT(vrt_io.h)
#include INC_GLUE(vrt_io.h)
#define MDB_IO_SIZES VRT_IO_SIZES
#define MDB_IO_NUMSIZES VRT_IO_NUMSIZES
@ -72,4 +71,5 @@ extern mdb_io_t mdb_io;
extern mdb_node_t * sigma0_ionode;
#endif /* !__PLATFORM__PC99__MDB_IO_H__ */
#endif /* !__GLUE__V4_X86__MDB_IO_H__ */

8
kernel/src/platform/pc99/vrt_io.cc → kernel/src/glue/v4-x86/vrt_io.cc
View File

@ -1,8 +1,8 @@
/*********************************************************************
*
* Copyright (C) 2005-2007, Karlsruhe University
* Copyright (C) 2005-2008, Karlsruhe University
*
* File path: platform/pc99/vrt_io.cc
* File path: glue/v4-x86/vrt_io.cc
* Description: VRT for thread objects
*
* Redistribution and use in source and binary forms, with or without
@ -30,8 +30,8 @@
*
********************************************************************/
#include INC_API(tcb.h)
#include INC_PLAT(vrt_io.h)
#include INC_PLAT(io_space.h)
#include INC_GLUE(vrt_io.h)
#include INC_GLUE(io_space.h)
#include <kdb/tracepoints.h>
#include <debug.h>

12
kernel/src/platform/pc99/vrt_io.h → kernel/src/glue/v4-x86/vrt_io.h
View File

@ -1,8 +1,8 @@
/*********************************************************************
*
* Copyright (C) 2005-2007, Karlsruhe University
* Copyright (C) 2005-2008, Karlsruhe University
*
* File path: platform/pc99/vrt_io.h
* File path: glue/v4-x86/vrt_io.h
* Description: VRT for IO ports specific declarations
*
* Redistribution and use in source and binary forms, with or without
@ -29,8 +29,9 @@
* $Id: vrt_io.h,v 1.4 2006/06/08 16:02:02 skoglund Exp $
*
********************************************************************/
#ifndef __PLATFORM__PC99__VRT_IO_H__
#define __PLATFORM__PC99__VRT_IO_H__
#ifndef __GLUE__V4_X86__VRT_IO_H__
#define __GLUE__V4_X86__VRT_IO_H__
#include <vrt.h>
#include <debug.h>
@ -167,5 +168,4 @@ typedef vrt_io_t io_space_t;
#endif /* !__PLATFORM__PC99__VRT_IO_H__ */
#endif /* !__GLUE__V4_X86__VRT_IO_H__ */

2
kernel/src/glue/v4-x86/x32/space.h
View File

@ -48,7 +48,7 @@
#endif
#if defined(CONFIG_X86_IO_FLEXPAGES)
#include INC_PLAT(io_space.h)
#include INC_GLUE(io_space.h)
#endif
// Even if new MDB is not used we need the mdb_t::ctrl_t

2
kernel/src/glue/v4-x86/x64/space.h
View File

@ -41,7 +41,7 @@
#include INC_GLUE(config.h)
#if defined(CONFIG_X86_IO_FLEXPAGES)
#include INC_PLAT(io_space.h)
#include INC_GLUE(io_space.h)
#endif
// Even if new MDB is not used we need the mdb_t::ctrl_t

4
kernel/src/platform/pc99/Makeconf
View File

@ -10,7 +10,3 @@ ifeq ("$(CONFIG_SMP)","y")
SOURCES += src/platform/pc99/smp.S
endif
ifeq ("$(CONFIG_X86_IO_FLEXPAGES)","y")
SOURCES += $(addprefix src/platform/pc99/, mdb_io.cc vrt_io.cc io_space.cc)
endif