more dependencies resolved

include/bas_string.h

@@ -28,6 +28,7 @@
 extern int strncmp(const char *s1, const char *s2, size_t max);
 extern char *strcpy(char *dst, const char *src);
 char *strncpy(char *dst, const char *src, size_t max);
+extern int strcmp(const char *s1, const char *s2);
 extern size_t strlen(const char *str);
 extern char *strcat(char *dst, const char *src);
 extern char *strncat(char *dst, const char *src, size_t max);

include/fb.h

@@ -468,7 +468,7 @@ struct fb_info {
 extern int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var); 
 extern int fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var); 
 extern int fb_blank(struct fb_info *info, int blank);
-extern int fb_ioctl(unsigned int cmd, unsigned long arg);
+extern int fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg);
 extern struct fb_info *framebuffer_alloc(unsigned long size);
 extern void framebuffer_release(struct fb_info *info);
 

include/radeonfb.h

@@ -9,6 +9,7 @@
 #include "i2c.h"
 #include "i2c-algo-bit.h"
 #include "util.h"			/* for swpX() */
+#include "wait.h"
 //#include "radeon_theatre.h"
 #include "radeon_reg.h"
 
@@ -470,7 +471,7 @@ struct radeonfb_info
  */
 static inline void _radeon_msleep(struct radeonfb_info *rinfo, uint32_t ms)
 {
-	mdelay(ms);
+	wait_ms(ms);
 }
 
 #define radeon_msleep(ms)		_radeon_msleep(rinfo,ms)

include/wait.h

@@ -41,6 +41,7 @@ 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));
+
 /*
  * 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.
@@ -52,6 +53,13 @@ extern __inline__ void wait(uint32_t us)
 	while (MCF_SLT_SCNT(0) - target > 0);
 }
 
+/*
+ * same as above, but with milliseconds wait time
+ */
+extern __inline__ void wait_ms(uint32_t ms)
+{
+	wait(ms * 1000);
+}
 /*
  * the same as above, with a checker function which gets called while
  * busy waiting and allows for an early return if it returns true

include/x86regs.h

@@ -315,12 +315,13 @@ typedef struct {
 extern "C" {            			/* Use "C" linkage when in C++ mode */
 #endif
 
-	/* Global emulator machine state.
-	 *
-	 * We keep it global to avoid pointer dereferences in the code for speed.
-	 */
+/* Global emulator machine state.
+ *
+ * We keep it global to avoid pointer dereferences in the code for speed.
+ */
+
+extern    X86EMU_sysEnv	_X86EMU_env;
 
-	extern    X86EMU_sysEnv	_X86EMU_env;
 #define   M             _X86EMU_env
 
 #define X86_EAX M.x86.R_EAX