kotovalexarian-likes-gitlab/sortix--sortix
1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
Code Releases Activity

Update kernel log to current coding conventions.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2013-09-23 21:20:00 +02:00
parent 9bb2ea78ac
commit ebef48ed61
2 changed files with 106 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
sortix/include/sortix/kernel/log.h
View file

@ -1,6 +1,6 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013.
This file is part of Sortix.
@ -22,74 +22,80 @@
*******************************************************************************/
#ifndef SORTIX_LOG_H
#define SORTIX_LOG_H
#ifndef INCLUDE_SORTIX_KERNEL_LOG_H
#define INCLUDE_SORTIX_KERNEL_LOG_H
#include <stdarg.h>
#include <stddef.h>
#include <stdio.h>
#include <string.h>
namespace Sortix
{
namespace Log
{
extern size_t (*deviceCallback)(void*, const char*, size_t);
extern size_t (*deviceWidth)(void*);
extern size_t (*deviceHeight)(void*);
extern bool (*deviceSync)(void*);
extern void* devicePointer;
namespace Sortix {
namespace Log {
void Init(size_t (*callback)(void*, const char*, size_t),
extern size_t (*device_callback)(void*, const char*, size_t);
extern size_t (*device_width)(void*);
extern size_t (*device_height)(void*);
extern bool (*device_sync)(void*);
extern void* device_pointer;
void Init(size_t (*callback)(void*, const char*, size_t),
size_t (*widthfunc)(void*),
size_t (*heightfunc)(void*),
bool (*syncfunc)(void*),
void* user);
inline void Flush()
{
if ( deviceCallback ) { deviceCallback(devicePointer, NULL, 0); }
}
inline size_t Width()
{
return deviceWidth(devicePointer);
}
inline size_t Height()
{
return deviceHeight(devicePointer);
}
inline bool Sync()
{
return deviceSync(devicePointer);
}
inline size_t Print(const char* str)
{
if ( !deviceCallback ) { return 0; }
return deviceCallback(devicePointer, str, strlen(str));
}
inline size_t PrintData(const void* ptr, size_t size)
{
if ( !deviceCallback ) { return 0; }
return deviceCallback(devicePointer, (const char*) ptr, size);
}
inline size_t PrintF(const char* format, ...)
{
va_list list;
va_start(list, format);
size_t result = vprintf_callback(deviceCallback, devicePointer, format, list);
va_end(list);
return result;
}
inline size_t PrintFV(const char* format, va_list list)
{
return vprintf_callback(deviceCallback, devicePointer, format, list);
}
}
inline void Flush()
{
if ( !device_callback )
return;
device_callback(device_pointer, NULL, 0);
}
inline size_t Width()
{
return device_width(device_pointer);
}
inline size_t Height()
{
return device_height(device_pointer);
}
inline bool Sync()
{
return device_sync(device_pointer);
}
inline size_t Print(const char* str)
{
if ( !device_callback )
return 0;
return device_callback(device_pointer, str, strlen(str));
}
inline size_t PrintData(const void* ptr, size_t size)
{
if ( !device_callback )
return 0;
return device_callback(device_pointer, (const char*) ptr, size);
}
inline size_t PrintF(const char* format, ...)
{
va_list list;
va_start(list, format);
size_t result = vprintf_callback(device_callback, device_pointer, format, list);
va_end(list);
return result;
}
inline size_t PrintFV(const char* format, va_list list)
{
return vprintf_callback(device_callback, device_pointer, format, list);
}
} // namespace Log
} // namespace Sortix
#endif

56
sortix/log.cpp
View file

@ -1,6 +1,6 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2011.
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013.
This file is part of Sortix.
@ -22,42 +22,42 @@
*******************************************************************************/
#include <sortix/kernel/platform.h>
#include <sortix/kernel/syscall.h>
#include <sortix/kernel/log.h>
#include <stddef.h>
#include <string.h>
namespace Sortix
#include <sortix/kernel/log.h>
#include <sortix/kernel/platform.h>
#include <sortix/kernel/syscall.h>
namespace Sortix {
namespace Log {
size_t (*device_callback)(void*, const char*, size_t) = NULL;
size_t (*device_width)(void*) = NULL;
size_t (*device_height)(void*) = NULL;
bool (*device_sync)(void*) = NULL;
void* device_pointer = NULL;
static size_t sys_print_string(const char* str)
{
namespace Log
{
size_t (*deviceCallback)(void*, const char*, size_t) = NULL;
size_t (*deviceWidth)(void*) = NULL;
size_t (*deviceHeight)(void*) = NULL;
bool (*deviceSync)(void*) = NULL;
void* devicePointer = NULL;
size_t SysPrintString(const char* str)
{
// TODO: Check that str is a user-readable string!
return Print(str);
}
}
void Init(size_t (*callback)(void*, const char*, size_t),
void Init(size_t (*callback)(void*, const char*, size_t),
size_t (*widthfunc)(void*),
size_t (*heightfunc)(void*),
bool (*syncfunc)(void*),
void* user)
{
deviceCallback = callback;
deviceWidth = widthfunc;
deviceHeight = heightfunc;
deviceSync = syncfunc;
devicePointer = user;
{
device_callback = callback;
device_width = widthfunc;
device_height = heightfunc;
device_sync = syncfunc;
device_pointer = user;
Syscall::Register(SYSCALL_PRINT_STRING, (void*) SysPrintString);
}
}
Syscall::Register(SYSCALL_PRINT_STRING, (void*) sys_print_string);
}
} // namespace Log
} // namespace Sortix