Commit 42685236 authored by bzt's avatar bzt

tty stuff

parent 01a211db
......@@ -51,7 +51,7 @@ License
-------
The boot loader, the [BOOTBOOT](https://gitlab.com/bztsrc/osz/tree/master/loader) Protocol and the
[on disk format of FS/Z](https://gitlab.com/bztsrc/osz/blob/master/etc/include/fsZ.h) are licensed under MIT licence.
[on disk format of FS/Z](https://gitlab.com/bztsrc/osz/blob/master/etc/include/sys/fsZ.h) are licensed under MIT licence.
All the other parts of OS/Z (including my [FS/Z](https://gitlab.com/bztsrc/osz/blob/master/docs/fs.md) implementation) licensed under CC-by-nc-sa-4.0:
Copyright (c) 2016-2018 bzt (bztsrc@gitlab) [CC-by-nc-sa-4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/)
......
......@@ -7,7 +7,7 @@ Developer's Corner
Materials interesting for developers.
* [Memory Management](https://gitlab.com/bztsrc/osz/blob/master/docs/memory.md) in OS/Z
* The [FS/Z](https://gitlab.com/bztsrc/osz/blob/master/docs/fs.md) file system, and it's [on disk format](https://gitlab.com/bztsrc/osz/blob/master/etc/include/fsZ.h)
* The [FS/Z](https://gitlab.com/bztsrc/osz/blob/master/docs/fs.md) file system, and it's [on disk format](https://gitlab.com/bztsrc/osz/blob/master/etc/include/sys/fsZ.h)
* About [processes](https://gitlab.com/bztsrc/osz/blob/master/docs/process.md)
* [Scheduler](https://gitlab.com/bztsrc/osz/blob/master/docs/scheduler.md)
* Using [messages](https://gitlab.com/bztsrc/osz/blob/master/docs/messages.md) at different levels (aka. syscalls in OS/Z)
......
......@@ -98,7 +98,7 @@ not given, then the first autodetected display driver will be used. If none was
linear framebuffer driver, which is slow, but works. Alternatively you can use a remote driver to force all windows to be sent to
another machine with "remote:(ip)", like `display=mc,remote:192.168.1.1`.
OS/Z supports several displays, the one loaded with the UI task is ":0", which is the first local monitor.
OS/Z supports several displays, the one loaded with the UI task is "0", which is the first local monitor.
Clock Source
------------
......
......@@ -12,7 +12,7 @@ by examining the sectors on a disk, looking for inodes of meta data.
Block size can be 2048, 4096, 8192... etc. The suggested size matches the memory page size on the architecture. That is 4096
for x86_64 and aarch64.
For detailed bit level specification and on disk format see [fsZ.h](https://gitlab.com/bztsrc/osz/blob/master/etc/include/fsZ.h). For
For detailed bit level specification and on disk format see [fsZ.h](https://gitlab.com/bztsrc/osz/blob/master/etc/include/sys/fsZ.h). For
the higher level abstraction layer, see [VFS](https://gitlab.com/bztsrc/osz/blob/master/docs/vfs.md).
Implementations
......
......@@ -15,6 +15,6 @@ Files
- *bochs.rc* [bochs](http://bochs.sourceforge.net/) configuration file
- *logo.png* *logo.tga* OS/Z logo
- *script.gdb* startup script for [GDB](https://www.sourceware.org/gdb/)
- *system.8x16.psf* [PC Screen Font](https://gitlab.com/bztsrc/osz/blob/master/src/core/font.h), default unicode font for kprintf and ttys
- *system.8x16.psf* [PC Screen Font](https://gitlab.com/bztsrc/osz/blob/master/etc/include/sys/psf.h), default UNICODE font for kprintf and ttys
- *system.8x16.txt* font source, use [txt2psf.sh](https://gitlab.com/bztsrc/osz/blob/master/tools/txt2psf.sh) to compile. Watch out, big file!
- *system.8x8.psf* much smaller alternative font for embedded versions, only 256 glyphs. To use this, you have to edit src/core/Makefile's font.o rule at line 46.
......@@ -463,7 +463,7 @@ void checkcompilation()
FSZ_DirEntHeader hdr;
FSZ_DirEnt ent;
// ********* WARNING *********
// These numbers MUST match the ones in: etc/include/fsZ.h
// These numbers MUST match the ones in: etc/include/sys/fsZ.h
if( (uint64_t)(&sb.numsec) - (uint64_t)(&sb) != 528 ||
(uint64_t)(&sb.rootdirfid) - (uint64_t)(&sb) != 560 ||
(uint64_t)(&sb.owner) - (uint64_t)(&sb) != 744 ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment