From 110abe94ebedd497a9256f29ec2cb8b4e533003f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 13 Jan 2008 01:41:25 +0000 Subject: [PATCH] Make it compile. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23472 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/platform/atari_m68k/shell.S | 6 +++--- src/system/boot/platform/atari_m68k/toscalls.h | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/system/boot/platform/atari_m68k/shell.S b/src/system/boot/platform/atari_m68k/shell.S index 7774d2cb1e..2a5fd0ee77 100644 --- a/src/system/boot/platform/atari_m68k/shell.S +++ b/src/system/boot/platform/atari_m68k/shell.S @@ -51,12 +51,12 @@ floppy_start: floppy_end: - .org FAILURE_STRING +// .org FAILURE_STRING .string " Loading failed! Press key to reboot.\r\n" - .org DOT_STRING +// .org DOT_STRING .string "." - .org 0x01fe +// .org 0x01fe .word 0xaa55 // this bumps the "start" label to offset 0x0200 as // expected by the BFS boot loader, and also marks diff --git a/src/system/boot/platform/atari_m68k/toscalls.h b/src/system/boot/platform/atari_m68k/toscalls.h index 8822260c39..d91d8b12d1 100644 --- a/src/system/boot/platform/atari_m68k/toscalls.h +++ b/src/system/boot/platform/atari_m68k/toscalls.h @@ -9,12 +9,12 @@ #ifndef _TOSCALLS_H #define _TOSCALLS_H -#include - #ifdef __cplusplus extern "C" { #endif +/* those are used by asm code too */ + #define DEV_PRINTER 0 #define DEV_AUX 1 #define DEV_CON 2 @@ -44,6 +44,8 @@ extern "C" { #ifndef __ASSEMBLER__ +#include + /* * Atari BIOS calls */