nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update kernel log to current coding conventions.

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

54
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. This file is part of Sortix.
@ -22,21 +22,22 @@
*******************************************************************************/ *******************************************************************************/
#ifndef SORTIX_LOG_H #ifndef INCLUDE_SORTIX_KERNEL_LOG_H
#define SORTIX_LOG_H #define INCLUDE_SORTIX_KERNEL_LOG_H
#include <stdarg.h>
#include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
namespace Sortix namespace Sortix {
{ namespace Log {
namespace Log
{ extern size_t (*device_callback)(void*, const char*, size_t);
extern size_t (*deviceCallback)(void*, const char*, size_t); extern size_t (*device_width)(void*);
extern size_t (*deviceWidth)(void*); extern size_t (*device_height)(void*);
extern size_t (*deviceHeight)(void*); extern bool (*device_sync)(void*);
extern bool (*deviceSync)(void*); extern void* device_pointer;
extern void* devicePointer;
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 (*widthfunc)(void*),
@ -46,50 +47,55 @@ namespace Sortix
inline void Flush() inline void Flush()
{ {
if ( deviceCallback ) { deviceCallback(devicePointer, NULL, 0); } if ( !device_callback )
return;
device_callback(device_pointer, NULL, 0);
} }
inline size_t Width() inline size_t Width()
{ {
return deviceWidth(devicePointer); return device_width(device_pointer);
} }
inline size_t Height() inline size_t Height()
{ {
return deviceHeight(devicePointer); return device_height(device_pointer);
} }
inline bool Sync() inline bool Sync()
{ {
return deviceSync(devicePointer); return device_sync(device_pointer);
} }
inline size_t Print(const char* str) inline size_t Print(const char* str)
{ {
if ( !deviceCallback ) { return 0; } if ( !device_callback )
return deviceCallback(devicePointer, str, strlen(str)); return 0;
return device_callback(device_pointer, str, strlen(str));
} }
inline size_t PrintData(const void* ptr, size_t size) inline size_t PrintData(const void* ptr, size_t size)
{ {
if ( !deviceCallback ) { return 0; } if ( !device_callback )
return deviceCallback(devicePointer, (const char*) ptr, size); return 0;
return device_callback(device_pointer, (const char*) ptr, size);
} }
inline size_t PrintF(const char* format, ...) inline size_t PrintF(const char* format, ...)
{ {
va_list list; va_list list;
va_start(list, format); va_start(list, format);
size_t result = vprintf_callback(deviceCallback, devicePointer, format, list); size_t result = vprintf_callback(device_callback, device_pointer, format, list);
va_end(list); va_end(list);
return result; return result;
} }
inline size_t PrintFV(const char* format, va_list list) inline size_t PrintFV(const char* format, va_list list)
{ {
return vprintf_callback(deviceCallback, devicePointer, format, list); return vprintf_callback(device_callback, device_pointer, format, list);
}
}
} }
} // namespace Log
} // namespace Sortix
#endif #endif

48
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. This file is part of Sortix.
@ -22,26 +22,25 @@
*******************************************************************************/ *******************************************************************************/
#include <sortix/kernel/platform.h> #include <stddef.h>
#include <sortix/kernel/syscall.h>
#include <sortix/kernel/log.h>
#include <string.h> #include <string.h>
namespace Sortix #include <sortix/kernel/log.h>
{ #include <sortix/kernel/platform.h>
namespace Log #include <sortix/kernel/syscall.h>
{
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) 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)
{ {
// TODO: Check that str is a user-readable string! // TODO: Check that str is a user-readable string!
return Print(str); return Print(str);
} }
@ -51,13 +50,14 @@ namespace Sortix
bool (*syncfunc)(void*), bool (*syncfunc)(void*),
void* user) void* user)
{ {
deviceCallback = callback; device_callback = callback;
deviceWidth = widthfunc; device_width = widthfunc;
deviceHeight = heightfunc; device_height = heightfunc;
deviceSync = syncfunc; device_sync = syncfunc;
devicePointer = user; device_pointer = user;
Syscall::Register(SYSCALL_PRINT_STRING, (void*) SysPrintString); Syscall::Register(SYSCALL_PRINT_STRING, (void*) sys_print_string);
}
}
} }
} // namespace Log
} // namespace Sortix