move logger
This commit is contained in:
@ -12,7 +12,7 @@
|
||||
* Aenderungen von Michael Schoettner, HHU, 21.8.2016 *
|
||||
*****************************************************************************/
|
||||
#include "devices/CGA.h"
|
||||
#include "user/lib/Memory.h"
|
||||
#include "user/lib/mem/Memory.h"
|
||||
|
||||
const IOport CGA::index_port(0x3d4);
|
||||
const IOport CGA::data_port(0x3d5);
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
#define VESA_include__
|
||||
|
||||
#include "devices/LFBgraphics.h"
|
||||
#include "user/lib/Logger.h"
|
||||
#include "user/lib/utility/Logger.h"
|
||||
|
||||
// Ausgewaehlte Grafikmodi mit Mode-Nummer
|
||||
constexpr const unsigned int MODE_640_480_16BITS = 0x111;
|
||||
|
||||
@ -11,6 +11,8 @@
|
||||
#ifndef FONTS_H__
|
||||
#define FONTS_H__
|
||||
|
||||
#include "user/lib/Array.h"
|
||||
|
||||
class Font {
|
||||
public:
|
||||
virtual ~Font() = default;
|
||||
@ -48,12 +50,12 @@ extern const unsigned char fontdata_pearl_8x8[];
|
||||
extern const unsigned char fontdata_sun_12x22[];
|
||||
extern const unsigned char fontdata_sun_8x16[];
|
||||
|
||||
typedef FontInstance<8, 16, fontdata_8x16> Font_8x16;
|
||||
typedef FontInstance<8, 8, fontdata_8x8> Font_8x8;
|
||||
typedef FontInstance<8, 8, acorndata_8x8> Font_acorn_8x8;
|
||||
typedef FontInstance<8, 8, fontdata_pearl_8x8> Font_pearl_8x8;
|
||||
typedef FontInstance<12, 22, fontdata_sun_12x22> Font_sun_12x22;
|
||||
typedef FontInstance<8, 16, fontdata_sun_8x16> Font_sun_8x16;
|
||||
using Font_8x16 = FontInstance<8, 16, fontdata_8x16>;
|
||||
using Font_8x8 = FontInstance<8, 8, fontdata_8x8>;
|
||||
using Font_acorn_8x8 = FontInstance<8, 8, acorndata_8x8>;
|
||||
using Font_pearl_8x8 = FontInstance<8, 8, fontdata_pearl_8x8>;
|
||||
using Font_sun_12x22 = FontInstance<12, 22, fontdata_sun_12x22>;
|
||||
using Font_sun_8x16 = FontInstance<8, 16, fontdata_sun_8x16>;
|
||||
|
||||
extern const Font_8x16 std_font_8x16;
|
||||
extern const Font_8x8 std_font_8x8;
|
||||
|
||||
Reference in New Issue
Block a user