Added devfs, with files /tty and /null and mounted it at /dev.
This commit is contained in:
parent
91a97a2667
commit
55240fb3f5
|
@ -58,6 +58,7 @@ namespace Maxsi
|
||||||
const int ENOMEM = 23;
|
const int ENOMEM = 23;
|
||||||
const int ERANGE = 24;
|
const int ERANGE = 24;
|
||||||
const int EISDIR = 25;
|
const int EISDIR = 25;
|
||||||
|
const int EPERM = 26;
|
||||||
|
|
||||||
extern int _errornumber;
|
extern int _errornumber;
|
||||||
|
|
||||||
|
|
|
@ -74,6 +74,7 @@ pipe.o \
|
||||||
filesystem.o \
|
filesystem.o \
|
||||||
directory.o \
|
directory.o \
|
||||||
mount.o \
|
mount.o \
|
||||||
|
fs/devfs.o \
|
||||||
fs/initfs.o \
|
fs/initfs.o \
|
||||||
fs/ramfs.o \
|
fs/ramfs.o \
|
||||||
../libmaxsi/libmaxsi-sortix.a
|
../libmaxsi/libmaxsi-sortix.a
|
||||||
|
|
|
@ -0,0 +1,237 @@
|
||||||
|
/******************************************************************************
|
||||||
|
|
||||||
|
COPYRIGHT(C) JONAS 'SORTIE' TERMANSEN 2011.
|
||||||
|
|
||||||
|
This file is part of Sortix.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
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 General Public License for more
|
||||||
|
details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with Sortix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
fs/devfs.cpp
|
||||||
|
Provides access to various block, character, and other kinds of devices.
|
||||||
|
|
||||||
|
******************************************************************************/
|
||||||
|
|
||||||
|
#include "../platform.h"
|
||||||
|
#include <libmaxsi/error.h>
|
||||||
|
#include <libmaxsi/string.h>
|
||||||
|
#include <libmaxsi/memory.h>
|
||||||
|
#include "../filesystem.h"
|
||||||
|
#include "../directory.h"
|
||||||
|
#include "../stream.h"
|
||||||
|
#include "devfs.h"
|
||||||
|
|
||||||
|
using namespace Maxsi;
|
||||||
|
|
||||||
|
namespace Sortix
|
||||||
|
{
|
||||||
|
class DevLogTTY : public DevStream
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
typedef DevStream BaseClass;
|
||||||
|
|
||||||
|
public:
|
||||||
|
DevLogTTY();
|
||||||
|
virtual ~DevLogTTY();
|
||||||
|
|
||||||
|
public:
|
||||||
|
virtual ssize_t Read(byte* dest, size_t count);
|
||||||
|
virtual ssize_t Write(const byte* src, size_t count);
|
||||||
|
virtual bool IsReadable();
|
||||||
|
virtual bool IsWritable();
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
DevLogTTY::DevLogTTY()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
DevLogTTY::~DevLogTTY()
|
||||||
|
{
|
||||||
|
// TODO: Make an array of waiting threads on the keyboard..
|
||||||
|
}
|
||||||
|
|
||||||
|
ssize_t DevLogTTY::Read(byte* /*dest*/, size_t /*count*/)
|
||||||
|
{
|
||||||
|
// TODO: Read from keyboard.
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
ssize_t DevLogTTY::Write(const byte* src, size_t count)
|
||||||
|
{
|
||||||
|
if ( SSIZE_MAX < count ) { count = SSIZE_MAX; }
|
||||||
|
|
||||||
|
return Log::deviceCallback(Log::devicePointer, (char*) src, count);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DevLogTTY::IsReadable()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DevLogTTY::IsWritable()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
class DevNull : public DevStream
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
typedef DevStream BaseClass;
|
||||||
|
|
||||||
|
public:
|
||||||
|
DevNull();
|
||||||
|
virtual ~DevNull();
|
||||||
|
|
||||||
|
public:
|
||||||
|
virtual ssize_t Read(byte* dest, size_t count);
|
||||||
|
virtual ssize_t Write(const byte* src, size_t count);
|
||||||
|
virtual bool IsReadable();
|
||||||
|
virtual bool IsWritable();
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
DevNull::DevNull()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
DevNull::~DevNull()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
ssize_t DevNull::Read(byte* /*dest*/, size_t /*count*/)
|
||||||
|
{
|
||||||
|
return 0; // Return EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
ssize_t DevNull::Write(const byte* /*src*/, size_t count)
|
||||||
|
{
|
||||||
|
if ( SSIZE_MAX < count ) { count = SSIZE_MAX; }
|
||||||
|
|
||||||
|
// O' glorious bitbucket in the sky, I hereby sacrifice to You, my holy
|
||||||
|
// data in trust You will keep it safe. That You will store it for all
|
||||||
|
// eternity, until the day You will return to User-Land to rule the land
|
||||||
|
// and preserve data-integrity for all eternity. Amen.
|
||||||
|
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DevNull::IsReadable()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DevNull::IsWritable()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
class DevDevFSDir : public DevDirectory
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
typedef Device DevDirectory;
|
||||||
|
|
||||||
|
public:
|
||||||
|
DevDevFSDir();
|
||||||
|
virtual ~DevDevFSDir();
|
||||||
|
|
||||||
|
public:
|
||||||
|
size_t position;
|
||||||
|
|
||||||
|
public:
|
||||||
|
virtual void Rewind();
|
||||||
|
virtual int Read(sortix_dirent* dirent, size_t available);
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
DevDevFSDir::DevDevFSDir()
|
||||||
|
{
|
||||||
|
position = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
DevDevFSDir::~DevDevFSDir()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void DevDevFSDir::Rewind()
|
||||||
|
{
|
||||||
|
position = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int DevDevFSDir::Read(sortix_dirent* dirent, size_t available)
|
||||||
|
{
|
||||||
|
const char* names[] = { "null", "tty" };
|
||||||
|
const size_t nameslength = 2;
|
||||||
|
|
||||||
|
if ( available <= sizeof(sortix_dirent) ) { return -1; }
|
||||||
|
if ( nameslength <= position )
|
||||||
|
{
|
||||||
|
dirent->d_namelen = 0;
|
||||||
|
dirent->d_name[0] = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* name = names[position];
|
||||||
|
size_t namelen = String::Length(name);
|
||||||
|
size_t needed = sizeof(sortix_dirent) + namelen + 1;
|
||||||
|
|
||||||
|
if ( available < needed )
|
||||||
|
{
|
||||||
|
dirent->d_namelen = needed;
|
||||||
|
Error::Set(Error::EINVAL);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
Memory::Copy(dirent->d_name, name, namelen + 1);
|
||||||
|
dirent->d_namelen = namelen;
|
||||||
|
position++;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
DevDevFS::DevDevFS()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
DevDevFS::~DevDevFS()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
Device* DevDevFS::Open(const char* path, int flags, mode_t mode)
|
||||||
|
{
|
||||||
|
if ( (flags & O_LOWERFLAGS) == O_SEARCH )
|
||||||
|
{
|
||||||
|
if ( path[0] == 0 || (path[0] == '/' && path[1] == 0) ) { return new DevDevFSDir(); }
|
||||||
|
Error::Set(Error::ENOTDIR);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( String::Compare(path, "/null") == 0 ) { return new DevNull; }
|
||||||
|
if ( String::Compare(path, "/tty") == 0 ) { return new DevLogTTY; }
|
||||||
|
|
||||||
|
Error::Set(Error::ENOENT);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DevDevFS::Unlink(const char* path)
|
||||||
|
{
|
||||||
|
if ( *path == '\0' || ( *path++ == '/' && *path == '\0' ) )
|
||||||
|
{
|
||||||
|
Error::Set(Error::EISDIR);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Error::Set(Error::EPERM);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
/******************************************************************************
|
||||||
|
|
||||||
|
COPYRIGHT(C) JONAS 'SORTIE' TERMANSEN 2011.
|
||||||
|
|
||||||
|
This file is part of Sortix.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
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 General Public License for more
|
||||||
|
details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with Sortix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
fs/devfs.h
|
||||||
|
Provides access to various block, character, and other kinds of devices.
|
||||||
|
|
||||||
|
******************************************************************************/
|
||||||
|
|
||||||
|
#ifndef SORTIX_FS_DEVFS_H
|
||||||
|
#define SORTIX_FS_DEVFS_H
|
||||||
|
|
||||||
|
#include <libmaxsi/sortedlist.h>
|
||||||
|
#include "../filesystem.h"
|
||||||
|
|
||||||
|
namespace Sortix
|
||||||
|
{
|
||||||
|
class DevDevFS : public DevFileSystem
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
DevDevFS();
|
||||||
|
virtual ~DevDevFS();
|
||||||
|
|
||||||
|
public:
|
||||||
|
virtual Device* Open(const char* path, int flags, mode_t mode);
|
||||||
|
virtual bool Unlink(const char* path);
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
#include "mount.h"
|
#include "mount.h"
|
||||||
#include "fs/ramfs.h"
|
#include "fs/ramfs.h"
|
||||||
#include "fs/initfs.h"
|
#include "fs/initfs.h"
|
||||||
|
#include "fs/devfs.h"
|
||||||
|
|
||||||
using namespace Maxsi;
|
using namespace Maxsi;
|
||||||
|
|
||||||
|
@ -133,6 +134,8 @@ namespace Sortix
|
||||||
if ( !rootfs || !Register(rootfs, "") ) { Panic("Unable to allocate rootfs"); }
|
if ( !rootfs || !Register(rootfs, "") ) { Panic("Unable to allocate rootfs"); }
|
||||||
DevFileSystem* initfs = new DevInitFS();
|
DevFileSystem* initfs = new DevInitFS();
|
||||||
if ( !initfs || !Register(initfs, "/bin") ) { Panic("Unable to allocate initfs"); }
|
if ( !initfs || !Register(initfs, "/bin") ) { Panic("Unable to allocate initfs"); }
|
||||||
|
DevFileSystem* devfs = new DevDevFS();
|
||||||
|
if ( !devfs || !Register(devfs, "/dev") ) { Panic("Unable to allocate devfs"); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@ int ls(const char* path)
|
||||||
sortix_dirent* dirent = (sortix_dirent*) buffer;
|
sortix_dirent* dirent = (sortix_dirent*) buffer;
|
||||||
|
|
||||||
// TODO: Hack until mountpoints work correctly.
|
// TODO: Hack until mountpoints work correctly.
|
||||||
if ( strcmp(path, "/") == 0 ) { printf("bin\n"); }
|
if ( strcmp(path, "/") == 0 ) { printf("bin\ndev\n"); }
|
||||||
|
|
||||||
while ( true )
|
while ( true )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue