1
This commit is contained in:
2022-07-24 16:51:16 +02:00
parent a15e1d9fd4
commit e1eac41853
18 changed files with 48 additions and 97 deletions

View File

@ -40,8 +40,6 @@ constexpr const fgc lgrey = fgc(CGA::LIGHT_GREY);
class CGA_Stream : public OutStream, public CGA {
private:
CGA_Stream(CGA_Stream& copy) = delete; // Verhindere Kopieren
// Allow for synchronization of output text, needed when running something in parallel to
// the PreemptiveThreadDemo for example
// NOTE: Should only be used by threads (like the demos) to not deadlock the system
@ -54,8 +52,10 @@ private:
friend class Logger; // Give access to the color
public:
CGA_Stream(CGA_Stream& copy) = delete; // Verhindere Kopieren
CGA_Stream() : sem(1), color_fg(CGA::LIGHT_GREY), color_bg(CGA::BLACK), blink(false) {
flush();
pos = 0;
}
void lock() { sem.p(); }

View File

@ -27,9 +27,9 @@ private:
int mode_nr; // Nummer des Modus
NamedLogger log;
public:
VESA(const VESA& copy) = delete; // Verhindere Kopieren
public:
VESA() : log("VESA") {}
// Bestimmten Grafikmodus einschalten

View File

@ -8,7 +8,7 @@
#define FONTDATAMAX_8x16 4096
constexpr const unsigned char fontdata_8x16[FONTDATAMAX_8x16] = {
constexpr unsigned char fontdata_8x16[FONTDATAMAX_8x16] = {
/* 0 0x00 '^@' */
0x00, /* 00000000 */

View File

@ -8,7 +8,7 @@
#define FONTDATAMAX_8x8 2048
constexpr const unsigned char fontdata_8x8[FONTDATAMAX_8x8] = {
constexpr unsigned char fontdata_8x8[FONTDATAMAX_8x8] = {
/* 0 0x00 '^@' */
0x00, /* 00000000 */

View File

@ -2,7 +2,7 @@
/* Acorn-like font definition, with PC graphics characters */
constexpr const unsigned char acorndata_8x8[] = {
constexpr unsigned char acorndata_8x8[] = {
/* 00 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ^@ */
/* 01 */ 0x7e, 0x81, 0xa5, 0x81, 0xbd, 0x99, 0x81, 0x7e, /* ^A */
/* 02 */ 0x7e, 0xff, 0xbd, 0xff, 0xc3, 0xe7, 0xff, 0x7e, /* ^B */

View File

@ -12,7 +12,7 @@
/**********************************************/
#define FONTDATAMAX_PEARL_8x8 2048
constexpr const unsigned char fontdata_pearl_8x8[FONTDATAMAX_PEARL_8x8] = {
constexpr unsigned char fontdata_pearl_8x8[FONTDATAMAX_PEARL_8x8] = {
/* 0 0x00 '^@' */
0x00, /* 00000000 */

View File

@ -2,7 +2,7 @@
#define FONTDATAMAX_SUN_12x22 11264
constexpr const unsigned char fontdata_sun_12x22[FONTDATAMAX_SUN_12x22] = {
constexpr unsigned char fontdata_sun_12x22[FONTDATAMAX_SUN_12x22] = {
/* 0 0x00 '^@' */
0x00, 0x00, /* 000000000000 */

View File

@ -2,7 +2,7 @@
#define FONTDATAMAX_SUN8x16 4096
constexpr const unsigned char fontdata_sun_8x16[FONTDATAMAX_SUN8x16] = {
constexpr unsigned char fontdata_sun_8x16[FONTDATAMAX_SUN8x16] = {
/* */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
/* */ 0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xbd,0x99,0x81,0x81,0x7e,0x00,0x00,0x00,0x00,
/* */ 0x00,0x00,0x7e,0xff,0xdb,0xff,0xff,0xc3,0xe7,0xff,0xff,0x7e,0x00,0x00,0x00,0x00,