Move <libmaxsi/sortedlist.h> into kernel tree.
This commit is contained in:
parent
df7d8ca335
commit
5e7bf8527c
|
@ -33,8 +33,6 @@
|
||||||
// TODO: Use the PCI to detect ATA devices instead of relying on them being on
|
// TODO: Use the PCI to detect ATA devices instead of relying on them being on
|
||||||
// standard locations.
|
// standard locations.
|
||||||
|
|
||||||
using namespace Maxsi;
|
|
||||||
|
|
||||||
namespace Sortix
|
namespace Sortix
|
||||||
{
|
{
|
||||||
const uint16_t PRIMARY_BUS_OFFSET = 0x1F0;
|
const uint16_t PRIMARY_BUS_OFFSET = 0x1F0;
|
||||||
|
|
|
@ -33,8 +33,6 @@
|
||||||
#include "fs/devfs.h"
|
#include "fs/devfs.h"
|
||||||
#include "com.h"
|
#include "com.h"
|
||||||
|
|
||||||
using namespace Maxsi;
|
|
||||||
|
|
||||||
namespace Sortix {
|
namespace Sortix {
|
||||||
namespace COM {
|
namespace COM {
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#ifndef SORTIX_FS_DEVFS_H
|
#ifndef SORTIX_FS_DEVFS_H
|
||||||
#define SORTIX_FS_DEVFS_H
|
#define SORTIX_FS_DEVFS_H
|
||||||
|
|
||||||
#include <libmaxsi/sortedlist.h>
|
#include <sortix/kernel/sortedlist.h>
|
||||||
#include "../filesystem.h"
|
#include "../filesystem.h"
|
||||||
|
|
||||||
namespace Sortix
|
namespace Sortix
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#ifndef SORTIX_FS_INITFS_H
|
#ifndef SORTIX_FS_INITFS_H
|
||||||
#define SORTIX_FS_INITFS_H
|
#define SORTIX_FS_INITFS_H
|
||||||
|
|
||||||
#include <libmaxsi/sortedlist.h>
|
#include <sortix/kernel/sortedlist.h>
|
||||||
#include "../filesystem.h"
|
#include "../filesystem.h"
|
||||||
|
|
||||||
namespace Sortix
|
namespace Sortix
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#ifndef SORTIX_FS_RAMFS_H
|
#ifndef SORTIX_FS_RAMFS_H
|
||||||
#define SORTIX_FS_RAMFS_H
|
#define SORTIX_FS_RAMFS_H
|
||||||
|
|
||||||
#include <libmaxsi/sortedlist.h>
|
#include <sortix/kernel/sortedlist.h>
|
||||||
#include "../filesystem.h"
|
#include "../filesystem.h"
|
||||||
|
|
||||||
namespace Sortix
|
namespace Sortix
|
||||||
|
@ -43,7 +43,7 @@ namespace Sortix
|
||||||
virtual bool Unlink(const char* path);
|
virtual bool Unlink(const char* path);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Maxsi::SortedList<DevRAMFSFile*>* files;
|
SortedList<DevRAMFSFile*>* files;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
size_t GetNumFiles();
|
size_t GetNumFiles();
|
||||||
|
|
|
@ -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
|
Sortix is free software: you can redistribute it and/or modify it under the
|
||||||
the terms of the GNU Lesser General Public License as published by the Free
|
terms of the GNU General Public License as published by the Free Software
|
||||||
Software Foundation, either version 3 of the License, or (at your option)
|
Foundation, either version 3 of the License, or (at your option) any later
|
||||||
any later version.
|
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
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||||
FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||||
more details.
|
details.
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public License
|
You should have received a copy of the GNU General Public License along with
|
||||||
along with LibMaxsi. If not, see <http://www.gnu.org/licenses/>.
|
Sortix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
sortedlist.h
|
sortedlist.h
|
||||||
A container that ensures its elements are always sorted when they are
|
A container that ensures its elements are always sorted when they are
|
||||||
accessed. It also provides binary search.
|
accessed. It also provides binary search.
|
||||||
|
|
||||||
******************************************************************************/
|
*******************************************************************************/
|
||||||
|
|
||||||
#ifndef LIBMAXSI_SORTEDLIST_H
|
#ifndef SORTIX_SORTEDLIST_H
|
||||||
#define LIBMAXSI_SORTEDLIST_H
|
#define SORTIX_SORTEDLIST_H
|
||||||
|
|
||||||
#ifndef SIZE_MAX
|
#ifndef SIZE_MAX
|
||||||
#error Define __STDC_LIMIT_MACROS before including <stdint.h>
|
#error Define __STDC_LIMIT_MACROS before including <stdint.h>
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
namespace Maxsi
|
namespace Sortix
|
||||||
{
|
{
|
||||||
template <class T> class SortedList
|
template <class T> class SortedList
|
||||||
{
|
{
|
||||||
|
@ -317,4 +317,3 @@ namespace Maxsi
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <sortix/mman.h>
|
#include <sortix/mman.h>
|
||||||
#include <sortix/wait.h>
|
#include <sortix/wait.h>
|
||||||
#include <libmaxsi/string.h>
|
#include <libmaxsi/string.h>
|
||||||
#include <libmaxsi/sortedlist.h>
|
#include <sortix/kernel/sortedlist.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
Loading…
Reference in New Issue