renamed all files which are part of the x86 emulator to start with "x86"

Makefile

@@ -116,14 +116,14 @@ CSRCS= \
 	radeon_cursor.c \
 	radeon_monitor.c \
 	\
-	decode.c \
-	sys.c \
-	debug.c \
-	prim_ops.c \
-	ops.c \
-	ops2.c \
-	fpu.c \
-	biosemu.c \
+	x86decode.c \
+	x86sys.c \
+	x86debug.c \
+	x86prim_ops.c \
+	x86ops.c \
+	x86ops2.c \
+	x86fpu.c \
+	x86biosemu.c \
 	x86pcibios.c \
 	\
 	basflash.c \

bas.lk.in

@@ -86,14 +86,14 @@ SECTIONS
 		OBJDIR/fbmodedb.o
 		OBJDIR/offscreen.o
 
-		OBJDIR/decode.o
-		OBJDIR/ops.o
-		OBJDIR/ops2.o
-		OBJDIR/fpu.o
-		OBJDIR/sys.o
-		OBJDIR/biosemu.o
-		OBJDIR/debug.o
-		OBJDIR/prim_ops.o
+		OBJDIR/x86decode.o
+		OBJDIR/x86ops.o
+		OBJDIR/x86ops2.o
+		OBJDIR/x86fpu.o
+		OBJDIR/x86sys.o
+		OBJDIR/x86biosemu.o
+		OBJDIR/x86debug.o
+		OBJDIR/x86prim_ops.o
 		OBJDIR/x86pcibios.o
 
 		OBJDIR/radeon_base.o

include/fb.h

@@ -541,42 +541,11 @@ extern void udelay(long usec);
 #define US_TO_TIMER(a) (((a)*256)/5000)
 #define TIMER_TO_US(a) (((a)*5000)/256)
 #endif
-extern long get_timer(void);
 extern void start_timeout(void);
 extern int end_timeout(long msec);
 extern void mdelay(long msec);
 extern void install_vbl_timer(void *func, int remove);
 extern void uninstall_vbl_timer(void *func);
 
-/*
- * fVDI access
- */
-extern void Funcs_copymem(const void *s, void *d, long n);
-extern const char *Funcs_next_line(const char *ptr);
-extern const char *Funcs_skip_space(const char *ptr);
-extern const char *Funcs_get_token(const char *ptr, char *buf, long n);
-extern long Funcs_equal(const char *str1, const char *str2);
-extern long Funcs_length(const char *text);
-extern void Funcs_copy(const char *src, char *dest);
-extern void Funcs_cat(const char *src, char *dest);
-extern long Funcs_numeric(long ch);
-extern long Funcs_atol(const char *text);
-extern void Funcs_error(const char *text1, const char *text2);
-extern void *Funcs_malloc(long size, long type);
-extern long Funcs_free(void *addr);
-extern int Funcs_puts(const char *text);
-extern void Funcs_ltoa(char *buf, long n, unsigned long base);
-extern long Funcs_get_cookie(const unsigned char *cname, long super);
-extern long Funcs_set_cookie(const unsigned char *cname, long value);
-//extern long Funcs_fixup_font(Fontheader *font, char *buffer, long flip);
-//extern long Funcs_unpack_font(Fontheader *header, long format);
-//extern long Funcs_insert_font(Fontheader **first_font, Fontheader *new_font);
-extern long Funcs_get_size(const char *name);
-extern char *Funcs_allocate_block(long size);
-extern void Funcs_free_block(void *address);
-extern void Funcs_cache_flush(void);
-extern long Funcs_misc(long func, long par, const char *token);
-extern long Funcs_event(long id_type, long data); 
-
 extern struct fb_info *info_fvdi;
 #endif /* _FB_H */

include/fpu.h

@@ -1,61 +0,0 @@
-/****************************************************************************
-*
-*						Realmode X86 Emulator Library
-*
-*            	Copyright (C) 1996-1999 SciTech Software, Inc.
-* 				     Copyright (C) David Mosberger-Tang
-* 					   Copyright (C) 1999 Egbert Eich
-*
-*  ========================================================================
-*
-*  Permission to use, copy, modify, distribute, and sell this software and
-*  its documentation for any purpose is hereby granted without fee,
-*  provided that the above copyright notice appear in all copies and that
-*  both that copyright notice and this permission notice appear in
-*  supporting documentation, and that the name of the authors not be used
-*  in advertising or publicity pertaining to distribution of the software
-*  without specific, written prior permission.  The authors makes no
-*  representations about the suitability of this software for any purpose.
-*  It is provided "as is" without express or implied warranty.
-*
-*  THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-*  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-*  EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-*  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-*  USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-*  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-*  PERFORMANCE OF THIS SOFTWARE.
-*
-*  ========================================================================
-*
-* Language:		ANSI C
-* Environment:	Any
-* Developer:    Kendall Bennett
-*
-* Description:  Header file for FPU instruction decoding.
-*
-****************************************************************************/
-
-#ifndef __X86EMU_FPU_H
-#define __X86EMU_FPU_H
-
-#ifdef  __cplusplus
-extern "C" {            			/* Use "C" linkage when in C++ mode */
-#endif
-
-/* these have to be defined, whether 8087 support compiled in or not. */
-
-extern void x86emuOp_esc_coprocess_d8 (u8 op1);
-extern void x86emuOp_esc_coprocess_d9 (u8 op1);
-extern void x86emuOp_esc_coprocess_da (u8 op1);
-extern void x86emuOp_esc_coprocess_db (u8 op1);
-extern void x86emuOp_esc_coprocess_dc (u8 op1);
-extern void x86emuOp_esc_coprocess_dd (u8 op1);
-extern void x86emuOp_esc_coprocess_de (u8 op1);
-extern void x86emuOp_esc_coprocess_df (u8 op1);
-
-#ifdef  __cplusplus
-}                       			/* End of "C" linkage for C++   	*/
-#endif
-
-#endif /* __X86EMU_FPU_H */

include/radeonfb.h

@@ -658,7 +658,7 @@ extern int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id
 extern void radeonfb_pci_unregister(void);
 
 /* global */
-extern uint8_t monitor_layout[];
+extern const char monitor_layout[];
 extern int16_t default_dynclk;
 extern int16_t ignore_edid;
 extern int16_t mirror;

include/wait.h

@@ -42,6 +42,10 @@ typedef bool (*checker_func)(void);
 extern __inline__ void wait(uint32_t) __attribute__((always_inline));
 extern __inline__ bool waitfor(uint32_t us, checker_func condition) __attribute__((always_inline));
 
+extern __inline__ uint32_t get_timer(void)
+{
+	return MCF_SLT_SCNT(0);
+}
 /*
  * wait for the specified number of us on slice timer 0. Replaces the original routines that had
  * the number of useconds to wait for hardcoded in their name.

radeon/radeon_base.c

@@ -1972,7 +1972,9 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent)
 	info = framebuffer_alloc(sizeof(struct radeonfb_info));
 	if (!info)
 		return -1; // -ENOMEM;
+
 	rinfo = info->par;
+
 	rinfo->info = info;
 	rinfo->handle = handle;
 	rinfo->name[11] = (char) (ent->device >> 8);

x86emu/x86biosemu.c

@@ -528,7 +528,7 @@ void run_bios(struct radeonfb_info *rinfo)
 	struct pci_data *rom_data;
 	unsigned long rom_size=0;
 	unsigned long image_size=0;
-	unsigned long biosmem = 0x01000000; /* when run_bios() is called, SDRAM is valid but not added to the system */
+	void *biosmem = (void *) 0x01000000; /* when run_bios() is called, SDRAM is valid but not added to the system */
 	unsigned long addr;
 	unsigned short initialcs;
 	unsigned short initialip;

x86emu/x86fpu.c

@@ -39,8 +39,8 @@
 
 #include "x86debug.h"
 #include "x86emui.h"
-#include "fpu.h"
-#include "fpu_regs.h"
+#include "x86fpu.h"
+#include "x86fpu_regs.h"
 
 /*----------------------------- Implementation ----------------------------*/