nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move <libmaxsi/sortedlist.h> into kernel tree.

This commit is contained in:
Jonas 'Sortie' Termansen 2012-09-22 22:31:49 +02:00
parent df7d8ca335
commit 5e7bf8527c
7 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sortix/ata.cpp
View File

@ -33,8 +33,6 @@
// TODO: Use the PCI to detect ATA devices instead of relying on them being on
// standard locations.
using namespace Maxsi;
namespace Sortix
{
const uint16_t PRIMARY_BUS_OFFSET = 0x1F0;

2
sortix/com.cpp
View File

@ -33,8 +33,6 @@
#include "fs/devfs.h"
#include "com.h"
using namespace Maxsi;
namespace Sortix {
namespace COM {

2
sortix/fs/devfs.h
View File

@ -25,7 +25,7 @@
#ifndef SORTIX_FS_DEVFS_H
#define SORTIX_FS_DEVFS_H
#include <libmaxsi/sortedlist.h>
#include <sortix/kernel/sortedlist.h>
#include "../filesystem.h"
namespace Sortix

2
sortix/fs/initfs.h
View File

@ -25,7 +25,7 @@
#ifndef SORTIX_FS_INITFS_H
#define SORTIX_FS_INITFS_H
#include <libmaxsi/sortedlist.h>
#include <sortix/kernel/sortedlist.h>
#include "../filesystem.h"
namespace Sortix

4
sortix/fs/ramfs.h
View File

@ -25,7 +25,7 @@
#ifndef SORTIX_FS_RAMFS_H
#define SORTIX_FS_RAMFS_H
#include <libmaxsi/sortedlist.h>
#include <sortix/kernel/sortedlist.h>
#include "../filesystem.h"
namespace Sortix
@ -43,7 +43,7 @@ namespace Sortix
virtual bool Unlink(const char* path);
private:
Maxsi::SortedList<DevRAMFSFile*>* files;
SortedList<DevRAMFSFile*>* files;
public:
size_t GetNumFiles();

33
libmaxsi/include/libmaxsi/sortedlist.h → sortix/include/sortix/kernel/sortedlist.h
View File

@ -1,30 +1,30 @@
/******************************************************************************
/*******************************************************************************
COPYRIGHT(C) JONAS 'SORTIE' TERMANSEN 2011, 2012.
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
This file is part of LibMaxsi.
This file is part of Sortix.
LibMaxsi is free software: you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option)
any later version.
Sortix 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 3 of the License, or (at your option) any later
version.
LibMaxsi is distributed in the hope that it will be useful, but WITHOUT ANY
Sortix 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 Lesser General Public License for
more details.
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
You should have received a copy of the GNU Lesser General Public License
along with LibMaxsi. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU General Public License along with
Sortix. If not, see <http://www.gnu.org/licenses/>.
sortedlist.h
A container that ensures its elements are always sorted when they are
accessed. It also provides binary search.
******************************************************************************/
*******************************************************************************/
#ifndef LIBMAXSI_SORTEDLIST_H
#define LIBMAXSI_SORTEDLIST_H
#ifndef SORTIX_SORTEDLIST_H
#define SORTIX_SORTEDLIST_H
#ifndef SIZE_MAX
#error Define __STDC_LIMIT_MACROS before including <stdint.h>
@ -32,7 +32,7 @@
#include <assert.h>
namespace Maxsi
namespace Sortix
{
template <class T> class SortedList
{
@ -317,4 +317,3 @@ namespace Maxsi
}
#endif

2
sortix/process.cpp
View File

@ -32,7 +32,7 @@
#include <sortix/mman.h>
#include <sortix/wait.h>
#include <libmaxsi/string.h>
#include <libmaxsi/sortedlist.h>
#include <sortix/kernel/sortedlist.h>
#include <assert.h>
#include <errno.h>
#include <string.h>