os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'shell' into acpi

This commit is contained in:
Adrien Bourmault 2020-02-06 14:47:06 +01:00
parent ea44aa84b1 bdb2a726ec
commit f4055f9586
104 changed files with 211 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.stylehlp
View File

@ -4,7 +4,7 @@
// Desc: // // Desc: //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //
@ -28,7 +28,7 @@
; Desc: ; ; Desc: ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;
@ -52,7 +52,7 @@
# Desc: # # Desc: #
# # # #
# # # #
# Copyright © 2018-2019 The OS/K Team # # Copyright © 2018-2020 The OS/K Team #
# # # #
# This file is part of OS/K. # # This file is part of OS/K. #
# # # #

2
.stylehlp_sh
View File

@ -4,7 +4,7 @@
# Desc: # # Desc: #
# # # #
# # # #
# Copyright © 2018-2019 The OS/K Team # # Copyright © 2018-2020 The OS/K Team #
# # # #
# This file is part of OS/K. # # This file is part of OS/K. #
# # # #

2
AUTHORS
View File

@ -4,7 +4,7 @@
# Desc: Project Authors File # # Desc: Project Authors File #
# # # #
# # # #
# Copyright © 2018-2019 The OS/K Team # # Copyright © 2018-2020 The OS/K Team #
# # # #
# This file is part of OS/K. # # This file is part of OS/K. #
# # # #

2
Makefile
View File

@ -4,7 +4,7 @@
# Desc: Project Makefile # # Desc: Project Makefile #
# # # #
# # # #
# Copyright © 2018-2019 The OS/K Team # # Copyright © 2018-2020 The OS/K Team #
# # # #
# This file is part of OS/K. # # This file is part of OS/K. #
# # # #

2
ProjectTree
View File

@ -4,7 +4,7 @@
# Desc: # # Desc: #
# # # #
# # # #
# Copyright © 2018-2019 The OS/K Team # # Copyright © 2018-2020 The OS/K Team #
# # # #
# This file is part of OS/K. # # This file is part of OS/K. #
# # # #

7
README.md
View File

@ -35,13 +35,8 @@ To compile and test, simply use at the root of this project :
make test make test
``` ```
To compile and install, simply use at the root of this project, with XXX the image or block file you want to use :
```
make install installdisk=XXX
```
#### Screenshot #### Screenshot
![OS/K Started](https://www.os-k.eu/images/screen6.png) ![OS/K Started](https://www.os-k.eu/images/screen44.png)

2
boot/folder.desc
View File

@ -4,7 +4,7 @@
# Desc: Folder description - "boot" # # Desc: Folder description - "boot" #
# # # #
# # # #
# Copyright © 2018-2019 The OS/K Team # # Copyright © 2018-2020 The OS/K Team #
# # # #
# This file is part of OS/K. # # This file is part of OS/K. #
# # # #

2
boot/grub/grub.cfg
View File

@ -4,7 +4,7 @@
# Desc: Grub 2 configuration file for OS/K boot # # Desc: Grub 2 configuration file for OS/K boot #
# # # #
# # # #
# Copyright © 2018-2019 The OS/K Team # # Copyright © 2018-2020 The OS/K Team #
# # # #
# This file is part of OS/K. # # This file is part of OS/K. #
# # # #

2
boot/loader/cpu/cpu.inc
View File

@ -5,7 +5,7 @@
; (x86_64 architecture only) ; ; (x86_64 architecture only) ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
boot/loader/cpu/cpu32.inc
View File

@ -5,7 +5,7 @@
; (x86_64 architecture only) ; ; (x86_64 architecture only) ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
boot/loader/io/terminal.inc
View File

@ -5,7 +5,7 @@
; (x86_64 architecture only) ; ; (x86_64 architecture only) ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
boot/loader/loader.asm
View File

@ -5,7 +5,7 @@
; (x86_64 architecture only) ; ; (x86_64 architecture only) ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
boot/loader/mem/management.inc
View File

@ -5,7 +5,7 @@
; (x86_64 architecture only) ; ; (x86_64 architecture only) ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
boot/loader/mem/structures.inc
View File

@ -5,7 +5,7 @@
; (x86_64 architecture only) ; ; (x86_64 architecture only) ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
boot/loader/multiboot/check.inc
View File

@ -5,7 +5,7 @@
; (x86_64 architecture only) ; ; (x86_64 architecture only) ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
boot/loader/multiboot/header.inc
View File

@ -5,7 +5,7 @@
; (x86_64 architecture only) ; ; (x86_64 architecture only) ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
build/create_disk.sh
View File

@ -4,7 +4,7 @@
# Desc: OS/K image maker script # # Desc: OS/K image maker script #
# # # #
# # # #
# Copyright © 2018-2019 The OS/K Team # # Copyright © 2018-2020 The OS/K Team #
# # # #
# This file is part of OS/K. # # This file is part of OS/K. #
# # # #

2
build/install-os-k.sh
View File

@ -4,7 +4,7 @@
# Desc: Grub installation script for the OS/K image # # Desc: Grub installation script for the OS/K image #
# # # #
# # # #
# Copyright © 2018-2019 The OS/K Team # # Copyright © 2018-2020 The OS/K Team #
# # # #
# This file is part of OS/K. # # This file is part of OS/K. #
# # # #

2
build/kernel.ld
View File

@ -5,7 +5,7 @@
// (x86_64 architecture only) // // (x86_64 architecture only) //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/asm.h
View File

@ -4,7 +4,7 @@
// Desc: Inline assembly functions // // Desc: Inline assembly functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/errno.h
View File

@ -4,7 +4,7 @@
// Desc: Values for error_t and errno // // Desc: Values for error_t and errno //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/ex/malloc.h
View File

@ -4,7 +4,7 @@
// Desc: Memory allocation functions // // Desc: Memory allocation functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/init/boot.h
View File

@ -4,7 +4,7 @@
// Desc: Kaleid kernel base include file // // Desc: Kaleid kernel base include file //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/init/mboot.h
View File

@ -5,7 +5,7 @@
// // // //
// // // //
// Copyright © 1999,2003,2007-2010 Free Software Foundation, Inc. // // Copyright © 1999,2003,2007-2010 Free Software Foundation, Inc. //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/io/acpi.h
View File

@ -4,7 +4,7 @@
// Desc: ACPI, Hardware detection related // // Desc: ACPI, Hardware detection related //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/io/ata.h
View File

@ -4,7 +4,7 @@
// Desc: Basic Read Only ATA Long mode Driver // // Desc: Basic Read Only ATA Long mode Driver //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/io/cursor.h
View File

@ -4,7 +4,7 @@
// Desc: Cursor-related functions // // Desc: Cursor-related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/io/keyb.h
View File

@ -4,7 +4,7 @@
// Desc: Keyboard related functions // // Desc: Keyboard related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/io/spkr.h
View File

@ -4,7 +4,7 @@
// Desc: Speaker functions // // Desc: Speaker functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/io/vga.h
View File

@ -4,7 +4,7 @@
// Desc: VGA terminal // // Desc: VGA terminal //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/ke/cpuid.h
View File

@ -4,7 +4,7 @@
// Desc: CPUID related functions // // Desc: CPUID related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/ke/idt.h
View File

@ -4,7 +4,7 @@
// Desc: Interrupt related functions // // Desc: Interrupt related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/ke/proc.h
View File

@ -4,7 +4,7 @@
// Desc: Process-related structs and functions // // Desc: Process-related structs and functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

6
include/ke/sched.h
View File

@ -4,7 +4,7 @@
// Desc: Scheduler-related functions // // Desc: Scheduler-related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //
@ -61,8 +61,8 @@ extern const char *PsPrioClassesNames[];
// Re-scheduling and preemption // Re-scheduling and preemption
// XXX atomic operations // XXX atomic operations
// //
#define PsRequestReSched() do { ++KeCurCPU->needReSched; } while (0) #define PsRequestReSched() (++KeCurCPU->needReSched)
#define PsDisablePreemption() do { ++KeCurCPU->preemptCount; } while (0) #define PsDisablePreemption() (++KeCurCPU->preemptCount)
#define PsEnablePreemption() do { assert(KeCurCPU->preemptCount > 0); \ #define PsEnablePreemption() do { assert(KeCurCPU->preemptCount > 0); \
--KeCurCPU->preemptCount; } while(0) --KeCurCPU->preemptCount; } while(0)

2
include/ke/spinlock.h
View File

@ -4,7 +4,7 @@
// Desc: Spinlocks // // Desc: Spinlocks //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/ke/time.h
View File

@ -4,7 +4,7 @@
// Desc: Time-related functions // // Desc: Time-related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/kernel.h
View File

@ -4,7 +4,7 @@
// Desc: Kaleid kernel base include file // // Desc: Kaleid kernel base include file //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

32
include/lib/buf.h
View File

@ -4,7 +4,7 @@
// Desc: Buffer library // // Desc: Buffer library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //
@ -138,18 +138,14 @@ int BGetState(Buffer_t *);
error_t BFlushBuf(Buffer_t *); error_t BFlushBuf(Buffer_t *);
error_t BPutOnBuf(Buffer_t *, uchar); error_t BPutOnBuf(Buffer_t *, uchar);
error_t BWriteOnBuf(Buffer_t *, uchar *, size_t);
error_t BPrintOnBuf(Buffer_t *, const char *, ...);
error_t BPrintOnBufV(Buffer_t *, const char *, va_list);
error_t BGetFromBuf(Buffer_t *, uchar *); error_t BGetFromBuf(Buffer_t *, uchar *);
error_t BReadBuf(Buffer_t *, uchar *, size_t);
// The following functions return the number of bytes written to the buffer error_t BScanBuf(Buffer_t *, const char *, ...);
size_t BWriteOnBuf(Buffer_t *, uchar *, size_t); error_t BScanBufV(Buffer_t *, const char *, va_list);
size_t BPrintOnBuf(Buffer_t *, const char *, ...);
size_t BPrintOnBufV(Buffer_t *, const char *, va_list);
// The following functions return the number of elements from their
// va_list's their wrote too, e.g. successful bscanf("%d %d", &a, &b) == 2
size_t BReadFromBuf(Buffer_t *, uchar *, size_t);
size_t BScanFromBuf(Buffer_t *, const char *, ...);
size_t BScanFromBufV(Buffer_t *, const char *, va_list);
void BLockBuf(Buffer_t *); void BLockBuf(Buffer_t *);
void BUnlockBuf(Buffer_t *); void BUnlockBuf(Buffer_t *);
@ -161,14 +157,14 @@ bool BTrylockBuf(Buffer_t *);
// //
error_t bputc(Buffer_t *, uchar); error_t bputc(Buffer_t *, uchar);
size_t bwrite(Buffer_t *, uchar *, size_t); error_t bwrite(Buffer_t *, uchar *, size_t);
size_t bprintf(Buffer_t *, const char *, ...); error_t bprintf(Buffer_t *, const char *, ...);
size_t vbprintf(Buffer_t *, const char *, va_list); error_t vbprintf(Buffer_t *, const char *, va_list);
error_t bgetc(Buffer_t *, uchar *); error_t bgetc(Buffer_t *, uchar *);
size_t bread(Buffer_t *, uchar *, size_t); error_t bread(Buffer_t *, uchar *, size_t);
size_t bscanf(Buffer_t *, const char *, ...); error_t bscanf(Buffer_t *, const char *, ...);
size_t vbscanf(Buffer_t *, const char *, va_list); error_t vbscanf(Buffer_t *, const char *, va_list);
error_t bemptybuf(Buffer_t *); error_t bemptybuf(Buffer_t *);
error_t bscrolldown(Buffer_t *); error_t bscrolldown(Buffer_t *);

2
include/lib/list.h
View File

@ -4,7 +4,7 @@
// Desc: Doubly linked lists implementation // // Desc: Doubly linked lists implementation //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

8
include/libc.h
View File

@ -4,7 +4,7 @@
// Desc: C Runtime Library // // Desc: C Runtime Library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //
@ -146,12 +146,8 @@ char *strrev(char *restrict, const char *restrict);
char *strrev2(char *); char *strrev2(char *);
size_t sprintf(char *, const char *, ...); size_t sprintf(char *, const char *, ...);
size_t vsprintf(char *, const char *, va_list);
// These return the number of bytes **written**
// not the number of bytes which would have been
// written had the buffer been large enough
size_t snprintf(char *, size_t, const char *, ...); size_t snprintf(char *, size_t, const char *, ...);
size_t vsprintf(char *, const char *, va_list);
size_t vsnprintf(char *, size_t, const char *, va_list); size_t vsnprintf(char *, size_t, const char *, va_list);
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//

2
include/mm/gdt.h
View File

@ -4,7 +4,7 @@
// Desc: GDT related functions // // Desc: GDT related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/mm/heap.h
View File

@ -4,7 +4,7 @@
// Desc: Heap management functions // // Desc: Heap management functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/mm/malloc.h
View File

@ -4,7 +4,7 @@
// Desc: Memory allocation functions // // Desc: Memory allocation functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/mm/map.h
View File

@ -4,7 +4,7 @@
// Desc: Mapping and checking memory related functions // // Desc: Mapping and checking memory related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/mm/paging.h
View File

@ -4,7 +4,7 @@
// Desc: Paging memory related functions // // Desc: Paging memory related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/mm/palloc.h
View File

@ -4,7 +4,7 @@
// Desc: Page allocator related functions // // Desc: Page allocator related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/po/shtdwn.h
View File

@ -4,7 +4,7 @@
// Desc: Shutdown facilities // // Desc: Shutdown facilities //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/sh/argv.h
View File

@ -4,7 +4,7 @@
// Desc: Command line parsing utilities // // Desc: Command line parsing utilities //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/sh/shell.h
View File

@ -4,7 +4,7 @@
// Desc: Kernel shell // // Desc: Kernel shell //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
include/vers.h
View File

@ -4,7 +4,7 @@
// Desc: Kaleid version // // Desc: Kaleid version //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/init/info.c
View File

@ -4,7 +4,7 @@
// Desc: Initialization of boot info // // Desc: Initialization of boot info //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/init/init.c
View File

@ -4,7 +4,7 @@
// Desc: Kernel entry point // // Desc: Kernel entry point //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

4
kaleid/kernel/init/ssp.c
View File

@ -4,7 +4,7 @@
// Desc: Stack smashing protection // // Desc: Stack smashing protection //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //
@ -24,7 +24,7 @@
#include <kernel.h> #include <kernel.h>
ulong __stack_chk_guard = 0xec0ffec0ffec0ffe; ulong __stack_chk_guard = 0xc0ffeb4b37a7adcc;
noreturn void __stack_chk_fail(void) noreturn void __stack_chk_fail(void)
{ {

2
kaleid/kernel/init/table.c
View File

@ -4,7 +4,7 @@
// Desc: Global variables // // Desc: Global variables //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/io/acpi.c
View File

@ -4,7 +4,7 @@
// Desc: ACPI, Hardware detection related functions // // Desc: ACPI, Hardware detection related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/io/ata.asm
View File

@ -5,7 +5,7 @@
; (x86_64 architecture only) ; ; (x86_64 architecture only) ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
kaleid/kernel/io/ata.c
View File

@ -4,7 +4,7 @@
// Desc: Basic Read Only ATA Long mode Driver // // Desc: Basic Read Only ATA Long mode Driver //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/io/cursor.c
View File

@ -4,7 +4,7 @@
// Desc: Cursor-related functions // // Desc: Cursor-related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/io/keyb.c
View File

@ -4,7 +4,7 @@
// Desc: Basic Keyboard Driver // // Desc: Basic Keyboard Driver //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/io/scan.c
View File

@ -4,7 +4,7 @@
// Desc: Basic Scancode Tables // // Desc: Basic Scancode Tables //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/io/vga.c
View File

@ -4,7 +4,7 @@
// Desc: VGA terminal functions // // Desc: VGA terminal functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/ke/cpuf.asm
View File

@ -4,7 +4,7 @@
; Desc: CPU management related functions ; ; Desc: CPU management related functions ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
kaleid/kernel/ke/cpuf.inc
View File

@ -4,7 +4,7 @@
; Desc: Interrupt Descriptor Table related macros ; ; Desc: Interrupt Descriptor Table related macros ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
kaleid/kernel/ke/cpuid.c
View File

@ -4,7 +4,7 @@
// Desc: CPU detection // // Desc: CPU detection //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/ke/idt.c
View File

@ -4,7 +4,7 @@
// Desc: Interrupt related functions // // Desc: Interrupt related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/ke/isr.asm
View File

@ -4,7 +4,7 @@
; Desc: Interrupt Descriptor Table related functions ; ; Desc: Interrupt Descriptor Table related functions ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
kaleid/kernel/ke/log.c
View File

@ -4,7 +4,7 @@
// Desc: KernLog() and DebugLog() // // Desc: KernLog() and DebugLog() //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

3
kaleid/kernel/ke/panic.c
View File

@ -4,7 +4,7 @@
// Desc: How NOT to panic 101 // // Desc: How NOT to panic 101 //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //
@ -26,6 +26,7 @@
#include <ke/proc.h> #include <ke/proc.h>
#include <io/vga.h> #include <io/vga.h>
error_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap);
extern bool KeIdtIsInitialized; extern bool KeIdtIsInitialized;
// //

2
kaleid/kernel/ke/pit.c
View File

@ -4,7 +4,7 @@
// Desc: PIT Time related functions // // Desc: PIT Time related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/ke/rtc.c
View File

@ -4,7 +4,7 @@
// Desc: RTC Time related functions // // Desc: RTC Time related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/mm/gdt.asm
View File

@ -4,7 +4,7 @@
; Desc: Interrupt Descriptor Table related functions ; ; Desc: Interrupt Descriptor Table related functions ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
kaleid/kernel/mm/gdt.c
View File

@ -4,7 +4,7 @@
// Desc: GDT related functions // // Desc: GDT related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/mm/heap.c
View File

@ -4,7 +4,7 @@
// Desc: Early and very dumb heap managment // // Desc: Early and very dumb heap managment //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/mm/malloc.c
View File

@ -4,7 +4,7 @@
// Desc: Early and very dumb memory managment // // Desc: Early and very dumb memory managment //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/mm/map.c
View File

@ -4,7 +4,7 @@
// Desc: Mapping and checking memory related functions // // Desc: Mapping and checking memory related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/mm/paging.asm
View File

@ -4,7 +4,7 @@
; Desc: Paging related functions ; ; Desc: Paging related functions ;
; ; ; ;
; ; ; ;
; Copyright © 2018-2019 The OS/K Team ; ; Copyright © 2018-2020 The OS/K Team ;
; ; ; ;
; This file is part of OS/K. ; ; This file is part of OS/K. ;
; ; ; ;

2
kaleid/kernel/mm/paging.c
View File

@ -4,7 +4,7 @@
// Desc: Paging memory related functions // // Desc: Paging memory related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/mm/palloc.c
View File

@ -4,7 +4,7 @@
// Desc: Page allocator related functions // // Desc: Page allocator related functions //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/po/shtdwn.c
View File

@ -4,7 +4,7 @@
// Desc: Shutdown related function // // Desc: Shutdown related function //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/ps/sched.c
View File

@ -4,7 +4,7 @@
// Desc: Process scheduler // // Desc: Process scheduler //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/sh/argv.c
View File

@ -4,7 +4,7 @@
// Desc: Command line parsing utilities // // Desc: Command line parsing utilities //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/sh/musage.c
View File

@ -4,7 +4,7 @@
// Desc: Kernel shell // // Desc: Kernel shell //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/sh/shell.c
View File

@ -4,7 +4,7 @@
// Desc: Kernel shell // // Desc: Kernel shell //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/sh/shell.h
View File

@ -4,7 +4,7 @@
// Desc: Kernel shell // // Desc: Kernel shell //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/kernel/sh/testcmds.c
View File

@ -4,7 +4,7 @@
// Desc: Kernel shell // // Desc: Kernel shell //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/libbuf/bclose.c
View File

@ -4,7 +4,7 @@
// Desc: Buffer library // // Desc: Buffer library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/libbuf/bflush.c
View File

@ -4,7 +4,7 @@
// Desc: Buffer library // // Desc: Buffer library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

8
kaleid/libbuf/bgetc.c
View File

@ -4,7 +4,7 @@
// Desc: Buffer library // // Desc: Buffer library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //
@ -43,9 +43,6 @@ error_t BGetFromBuf(Buffer_t *buf, uchar *ch)
ExReleaseLock(&buf->lock); ExReleaseLock(&buf->lock);
return rc; return rc;
} }
// Note: any change to this must be done while
// keeping in mind vbscanf()'s workaround for ungetc()
error_t bgetc(Buffer_t *buf, uchar *ch) error_t bgetc(Buffer_t *buf, uchar *ch)
{ {
error_t rc = EOK; error_t rc = EOK;
@ -73,9 +70,6 @@ error_t bgetc(Buffer_t *buf, uchar *ch)
while (buf->rp >= buf->wp) { while (buf->rp >= buf->wp) {
#ifdef _KALEID_KERNEL #ifdef _KALEID_KERNEL
KeSleep(1); // XXX synchronization with keyboard driver KeSleep(1); // XXX synchronization with keyboard driver
#else
buf->flags |= BF_EOF;
return EENDF; // Currently empty
#endif #endif
} }

2
kaleid/libbuf/bmisc.c
View File

@ -4,7 +4,7 @@
// Desc: Buffer library // // Desc: Buffer library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/libbuf/bopen.c
View File

@ -4,7 +4,7 @@
// Desc: Buffer library // // Desc: Buffer library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

144
kaleid/libbuf/bprint.c
View File

@ -4,7 +4,7 @@
// Desc: Buffer library // // Desc: Buffer library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //
@ -31,41 +31,73 @@
// //
// Prints formatted string on buf according to fmt // Prints formatted string on buf according to fmt
// //
size_t BPrintOnBuf(Buffer_t *buf, const char *fmt, ...) error_t BPrintOnBuf(Buffer_t *buf, const char *fmt, ...)
{ {
size_t sz; error_t rc;
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
ExAcquireLock(&buf->lock); ExAcquireLock(&buf->lock);
sz = vbprintf(buf, fmt, ap); rc = vbprintf(buf, fmt, ap);
ExReleaseLock(&buf->lock); ExReleaseLock(&buf->lock);
va_end(ap); va_end(ap);
return sz; return rc;
} }
size_t BPrintOnBufV(Buffer_t *buf, const char *fmt, va_list ap) error_t BPrintOnBufV(Buffer_t *buf, const char *fmt, va_list ap)
{ {
size_t sz; error_t rc;
ExAcquireLock(&buf->lock); ExAcquireLock(&buf->lock);
sz = vbprintf(buf, fmt, ap); rc = vbprintf(buf, fmt, ap);
ExReleaseLock(&buf->lock); ExReleaseLock(&buf->lock);
return sz; return rc;
} }
size_t bprintf(Buffer_t *buf, const char *fmt, ...) error_t bprintf(Buffer_t *buf, const char *fmt, ...)
{ {
size_t sz; error_t rc;
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
sz = vbprintf(buf, fmt, ap); rc = vbprintf(buf, fmt, ap);
va_end(ap); va_end(ap);
return sz; return rc;
}
//
// Prints 0 for octal, 0x for hexadecimal, 0b for binary
//
static error_t bprinthash(Buffer_t *buf, int base, int cap)
{
error_t rc;
if (base != 2 && base != 8 && base != 16) {
return EOK;
}
rc = bputc(buf, '0');
if (!rc && base != 8) {
rc = bputc(buf, (base == 2 ? 'b' : (cap ? 'X' : 'x')));
}
return rc;
}
static error_t bdopadding(Buffer_t *buf, size_t width, size_t len,
char filler)
{
error_t rc = EOK;
for (; !rc && width > len ; width--) {
rc = bputc(buf, filler);
}
return rc;
} }
#define CONVBUFSIZE 100 #define CONVBUFSIZE 100
@ -74,10 +106,9 @@ size_t bprintf(Buffer_t *buf, const char *fmt, ...)
// Actually does BPrintOnBuf's job; doesn't lock anything // Actually does BPrintOnBuf's job; doesn't lock anything
// Quite a long function // Quite a long function
// //
size_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap) error_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap)
{ {
error_t rc = 0; error_t rc = 0;
size_t written = 0;
ssize_t width, prec, len; ssize_t width, prec, len;
char type; char type;
@ -103,11 +134,10 @@ size_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap)
// Base // Base
int base; int base;
if (!buf || !fmt) { seterrno(EINVAL); return 0; } if (!buf || !fmt) return EINVAL;
if (buf->flags & (BF_EOF|BF_ERR)) { seterrno(EENDF); return 0; } if (buf->flags & (BF_EOF|BF_ERR)) return EENDF;
if (buf->state != BS_RDWR && buf->state != BS_WRONLY) { if (buf->state != BS_RDWR && buf->state != BS_WRONLY) {
seterrno(EBADF); return EBADF;
return 0;
} }
// Progress in format string // Progress in format string
@ -116,14 +146,14 @@ size_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap)
// Deal with all non-'%' characters // Deal with all non-'%' characters
if (*fmt != '%') { if (*fmt != '%') {
rc = bputc(buf, *fmt); rc = bputc(buf, *fmt);
written++;
fmt++;
fmt++;
continue; continue;
} }
// //
// %[flags][width|*][.precision|*][length]type // %[parameter][flags][width|*][.precision|*][length]type
// We aren't dealing with parameters and floating stuff just yet
// //
// Skip the '%' // Skip the '%'
@ -132,9 +162,8 @@ size_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap)
// "%%" modifier // "%%" modifier
if (*fmt == '%') { if (*fmt == '%') {
rc = bputc(buf, '%'); rc = bputc(buf, '%');
written++;
fmt++;
fmt++;
continue; continue;
} }
@ -224,7 +253,6 @@ size_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap)
if (type == 'c') { if (type == 'c') {
uch = (uchar)va_arg(ap, int); uch = (uchar)va_arg(ap, int);
rc = bputc(buf, uch); rc = bputc(buf, uch);
written++;
continue; continue;
} }
@ -233,10 +261,8 @@ size_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap)
if (type == 'C') { if (type == 'C') {
base = va_arg(ap, int); base = va_arg(ap, int);
if (!(base < 0 || base > VGA_COLOR_WHITE)) { if (!(base < 0 || base > VGA_COLOR_WHITE))
rc = bputc(buf, RtlColorToChar(base)); rc = bputc(buf, RtlColorToChar(base));
written++;
}
assert(!rc && 1); assert(!rc && 1);
@ -255,7 +281,7 @@ size_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap)
// Zero/nonspecified precision means unlimited amount // Zero/nonspecified precision means unlimited amount
if (prec == 0) prec = INT_MAX; if (prec == 0) prec = INT_MAX;
for (; !rc && *s && prec-- ; s++) { for (; *s && prec-- ; s++) {
rc = bputc(buf, (uchar)*s); rc = bputc(buf, (uchar)*s);
} }
@ -266,7 +292,6 @@ size_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap)
// Make sure width and prec aren't too big // Make sure width and prec aren't too big
// (We didn't do that earlier because %s uses width) // (We didn't do that earlier because %s uses width)
if (width > CONVBUFSIZE || prec > CONVBUFSIZE) { if (width > CONVBUFSIZE || prec > CONVBUFSIZE) {
written++; // Work around "if (rc) return written - 1;"
rc = EINVAL; rc = EINVAL;
break; break;
} }
@ -288,16 +313,16 @@ size_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap)
// End of string too soon // End of string too soon
else if (type == '\0') { else if (type == '\0') {
bputc(buf, '%');
rc = EINVAL; rc = EINVAL;
written++; // fool the line "if (rc) return written-1;"
break; break;
} }
// Unknown/unsupported modifier // Unknown/unsupported modifier
else { else {
rc = bputc(buf, '%'); bputc(buf, '%');
written++; bputc(buf, '?');
rc = bputc(buf, type);
continue; continue;
} }
@ -357,63 +382,36 @@ size_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap)
} }
// When padding with spaces, we pad before +/-'s etc // When padding with spaces, we pad before +/-'s etc
if (!minus && !zero && width > len) { if (!minus && !zero && width > len)
for (; !rc && width > len ; width--) { bdopadding(buf, width, len, ' ');
rc = bputc(buf, ' ');
written++;
}
}
// Deal with signs and the hash flag // Deal with signs and the hash flag
if (*s == '-') { rc = bputc(buf, '-'); s++, len--; written++; } if (*s == '-') { rc = bputc(buf, '-'); s++, len--; }
else if (sgn && plus) { rc = bputc(buf, '+'); written++; } else if (sgn && plus) rc = bputc(buf, '+');
else if (sgn && space) { rc = bputc(buf, ' '); written++; } else if (sgn && space) rc = bputc(buf, ' ');
else if (hash) bprinthash(buf, base, cap);
// Print 0 for octal, 0x for hexadecimal, 0b for binary
else if (hash && (base == 2 || base == 8 || base == 16)) {
rc = bputc(buf, '0');
written++;
if (!rc && base != 8) {
rc = bputc(buf, (base == 2 ? 'b' : (cap ? 'X' : 'x')));
written++;
}
}
// Deal with padding by zeroes // Deal with padding by zeroes
// The 'minus' flag makes no sense with the 'zero' one // The 'minus' flag makes no sense with the 'zero' one
if (zero && width > len) { if (zero && width > len)
for (; !rc && width > len ; width--) { bdopadding(buf, width, len, '0');
rc = bputc(buf, '0');
written++;
}
}
// Output the actual number // Output the actual number
for (; !rc && *s ; s++) { for (; !rc && *s ; s++) {
rc = bputc(buf, (uchar)*s); rc = bputc(buf, (uchar)*s);
written++;
} }
// 'minus' padding, only with spaces // 'minus' padding, only with spaces
if (minus && !zero && width > len) { if (minus && !zero && width > len)
for (; !rc && width > len ; width--) { bdopadding(buf, width, base, ' ');
rc = bputc(buf, ' ');
written++;
}
}
// Carry on to next modifier // Carry on to next modifier
} }
// For debugging purposes // For debugging purposes
if(rc)KeStartPanic("%s",strerror(rc));
assert(!rc && "vbprintf() error"); assert(!rc && "vbprintf() error");
seterrno(rc);
if (rc) return rc;
return written - 1; // "- 1" because last bputc() must have failed
else
return written;
} }

2
kaleid/libbuf/bputc.c
View File

@ -4,7 +4,7 @@
// Desc: Buffer library // // Desc: Buffer library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/libbuf/bread.c
View File

@ -4,7 +4,7 @@
// Desc: Buffer library // // Desc: Buffer library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

204
kaleid/libbuf/bscan.c
View File

@ -4,7 +4,7 @@
// Desc: Buffer library // // Desc: Buffer library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //
@ -23,206 +23,4 @@
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//
#include <lib/buf.h> #include <lib/buf.h>
//
// Builds string reading from buf according to fmt
//
size_t BScanFromBuf(Buffer_t *buf, const char *fmt, ...)
{
size_t sz;
va_list ap;
va_start(ap, fmt);
ExAcquireLock(&buf->lock);
sz = vbscanf(buf, fmt, ap);
ExReleaseLock(&buf->lock);
va_end(ap);
return sz;
}
size_t BScanFromBufV(Buffer_t *buf, const char *fmt, va_list ap)
{
size_t sz;
ExAcquireLock(&buf->lock);
sz = vbscanf(buf, fmt, ap);
ExReleaseLock(&buf->lock);
return sz;
}
size_t bscanf(Buffer_t *buf, const char *fmt, ...)
{
size_t sz;
va_list ap;
va_start(ap, fmt);
sz = vbscanf(buf, fmt, ap);
va_end(ap);
return sz;
}
size_t vbscanf(Buffer_t *buf, const char *fmt, va_list ap)
{
error_t rc = EOK;
size_t readcnt = 0;
uchar ch = 0;
char *chptr;
bool l, h;
size_t width;
bool ignore; // '*' modifier, don't write to va_list for current mod
if (!buf || !fmt) { seterrno(EINVAL); return 0; }
if (buf->flags & (BF_EOF|BF_ERR)) { seterrno(EENDF); return 0; }
if (buf->state != BS_RDWR && buf->state != BS_WRONLY) {
seterrno(EBADF);
return 0;
}
// Progress in format string
while (*fmt && !rc) {
// Skip all kinds of whitespaces
if (isspace(*fmt)) {
another_space:
rc = bgetc(buf, &ch);
if (!rc) break;
// Put back non-whitespaces and progress
if (!isspace(ch)) {
buf->rp--;
do { fmt++; } while (isspace(*fmt));
continue;
}
else goto another_space;
}
// Deal with all non-'%' non-whitespace characters
if (*fmt != '%') {
rc = bgetc(buf, &ch);
// Is it what we expected?
if (!rc && ch != *fmt) {
// No, so put it back
buf->rp--;
break;
}
// We don't do anything with these characters
continue;
}
//
// %[*][width][modifier]type
//
// Skip the %
fmt++;
// '%%' type
if (*fmt == '%') {
rc = bgetc(buf, &ch);
if (!rc && ch != '%') {
buf->rp--;
break;
}
continue;
}
l = h = 0;
width = 0;
ignore = 0;
// Don't write to variable
if (*fmt == '*') {
ignore = 1;
fmt++;
}
// Extract width field
while (isdigit(*fmt)) {
width = 10 * width + (*fmt - '0');
fmt++;
}
//
// Extract length field
//
if (*fmt == 'l') {
l = 1;
fmt++;
}
else if (*fmt == 'h') {
h = 1;
fmt++;
}
//
// Types
//
// Read character(s)
if (*fmt == 'c') {
if (width == 0) width = 1;
// For >1 width, read that many characters
// then store them in successive argument pointers
for (; width; width--) {
rc = bgetc(buf, &ch);
if (!rc) break;
if (ignore) continue;
chptr = va_arg(ap, char *);
*chptr = (char)ch;
readcnt++;
}
}
// Decimal integer
else if (*fmt == 'd') {
;
}
}
// For debugging purposes
assert(!rc && "vbscanf() error");
seterrno(rc);
return readcnt;
}

2
kaleid/libbuf/bscroll.c
View File

@ -4,7 +4,7 @@
// Desc: Buffer library // // Desc: Buffer library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/libbuf/bwrite.c
View File

@ -4,7 +4,7 @@
// Desc: Buffer library // // Desc: Buffer library //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/libc/atoi.c
View File

@ -4,7 +4,7 @@
// Desc: Convertion utilities - atoi() family // // Desc: Convertion utilities - atoi() family //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/libc/ctype.c
View File

@ -4,7 +4,7 @@
// Desc: Character types // // Desc: Character types //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/libc/errno.c
View File

@ -4,7 +4,7 @@
// Desc: strerror() & co. // // Desc: strerror() & co. //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

2
kaleid/libc/mem.c
View File

@ -4,7 +4,7 @@
// Desc: mem*() family // // Desc: mem*() family //
// // // //
// // // //
// Copyright © 2018-2019 The OS/K Team // // Copyright © 2018-2020 The OS/K Team //
// // // //
// This file is part of OS/K. // // This file is part of OS/K. //
// // // //

Some files were not shown because too many files have changed in this diff Show More