[haiku-commits] r38928 - haiku/trunk/src/system/boot/platform/amiga_m68k
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 10 Oct 2010 15:15:39 +0200 (CEST)
Author: mmu_man
Date: 2010-10-10 15:15:39 +0200 (Sun, 10 Oct 2010)
New Revision: 38928
Changeset: http://dev.haiku-os.org/changeset/38928
Modified:
haiku/trunk/src/system/boot/platform/amiga_m68k/debug.cpp
haiku/trunk/src/system/boot/platform/amiga_m68k/keyboard.cpp
haiku/trunk/src/system/boot/platform/amiga_m68k/start.cpp
Log:
Remove Atari stuff.
Modified: haiku/trunk/src/system/boot/platform/amiga_m68k/debug.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/amiga_m68k/debug.cpp 2010-10-10
13:15:16 UTC (rev 38927)
+++ haiku/trunk/src/system/boot/platform/amiga_m68k/debug.cpp 2010-10-10
13:15:39 UTC (rev 38928)
@@ -10,6 +10,7 @@
#include <boot/platform.h>
#include <boot/stdio.h>
#include <stdarg.h>
+#include <string.h>
#include <Errors.h>
@@ -19,21 +20,20 @@
panic(const char *format, ...)
{
struct AlertMessage {
- UWORD column;
- UBYTE line;
+ uint16 column;
+ uint8 line;
char messages[14+512];
} alert = {
10, 12,
"*** PANIC ***"
- }
+ };
- const char greetings[] = "\n*** PANIC ***";
char *buffer = &alert.messages[14];
va_list list;
//platform_switch_to_text_mode();
- memset(buffer, 512);
+ memset(buffer, 0, 512);
va_start(list, format);
vsnprintf(buffer, 512-1, format, list);
Modified: haiku/trunk/src/system/boot/platform/amiga_m68k/keyboard.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/amiga_m68k/keyboard.cpp
2010-10-10 13:15:16 UTC (rev 38927)
+++ haiku/trunk/src/system/boot/platform/amiga_m68k/keyboard.cpp
2010-10-10 13:15:39 UTC (rev 38928)
@@ -5,7 +5,7 @@
#include "keyboard.h"
-#include "toscalls.h"
+#include "amicalls.h"
#include <boot/platform.h>
@@ -13,12 +13,8 @@
static uint32
check_for_key(void)
{
- union key k;
- if (Bconstat(DEV_CON) == 0)
- return 0;
-
- k.d0 = Bconin(DEV_CON);
- return k.d0;
+ //TODO
+ return 0;
}
@@ -33,8 +29,8 @@
extern "C" union key
wait_for_key(void)
{
+ //TODO
union key key;
- key.d0 = Bconin(DEV_CON);
return key;
}
Modified: haiku/trunk/src/system/boot/platform/amiga_m68k/start.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/amiga_m68k/start.cpp 2010-10-10
13:15:16 UTC (rev 38927)
+++ haiku/trunk/src/system/boot/platform/amiga_m68k/start.cpp 2010-10-10
13:15:39 UTC (rev 38928)
@@ -17,7 +17,7 @@
#include "cpu.h"
#include "mmu.h"
#include "keyboard.h"
-#include "toscalls.h"
+#include "amicalls.h"
#define HEAP_SIZE 65536
@@ -113,8 +113,8 @@
platform_exit(void)
{
// Terminate
- // TODO: Puntaes() instead ?
- Pterm0();
+ //TODO
+ while (true) {}
}
@@ -122,32 +122,20 @@
_start(void)
{
stage2_args args;
- Bconout(DEV_CON, 'H');
//asm("cld"); // Ain't nothing but a GCC thang.
//asm("fninit"); // initialize floating point unit
clear_bss();
- Bconout(DEV_CON, 'A');
call_ctors();
// call C++ constructors before doing anything else
- Bconout(DEV_CON, 'I');
args.heap_size = HEAP_SIZE;
args.arguments = NULL;
- // so we can dprintf
- init_nat_features();
-
//serial_init();
- Bconout(DEV_CON, 'K');
console_init();
- Bconout(DEV_CON, 'U');
- dprintf("membot = %p\n", (void*)*TOSVAR_membot);
- dprintf("memtop = %p\n", (void*)*TOSVAR_memtop);
- dprintf("v_bas_ad = %p\n", *TOSVAR_v_bas_ad);
- dprintf("phystop = %p\n", (void*)*TOSVARphystop);
- dprintf("ramtop = %p\n", (void*)*TOSVARramtop);
+ dprintf("ramtop = %p\n", NULL);
cpu_init();
mmu_init();
Other related posts:
- » [haiku-commits] r38928 - haiku/trunk/src/system/boot/platform/amiga_m68k - revol