[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[MiNT] [PATCH] Remove XHDI define in kentry
As discussed in emails from yesterday.
Please commit. Thanks!
Commit message:
Remove XHDI_MASS_STORAGE_SUPPORT define.
Index: sys/kentry.c
===================================================================
RCS file: /mint/freemint/sys/kentry.c,v
retrieving revision 1.19
diff -u -8 -r1.19 kentry.c
--- sys/kentry.c 7 May 2011 04:27:06 -0000 1.19
+++ sys/kentry.c 26 Mar 2014 09:44:20 -0000
@@ -57,20 +57,18 @@
# include "semaphores.h" /* semaphore_* */
# include "signal.h" /* ikill */
# include "syscall_vectors.h" /* bios_tab, dos_tab */
# include "time.h" /* xtime */
# include "timeout.h" /* nap, addtimeout, canceltimeout, addroottimeout, cancelroottimeout */
# include "umemory.h" /* umalloc, ufree */
# include "util.h" /* pid2proc */
# include "xfs_xdd.h"
-
-# ifdef XHDI_MASS_STORAGE_SUPPORT
# include "xhdi.h" /* XHNewCookie */
-# endif
+
# undef DEFAULT_MODE
# undef DEFAULT_DIRMODE
# define DEFAULT_MODE (0644)
# define DEFAULT_DIRMODE (0755)
Index: sys/libkern/kernel_module.h
===================================================================
RCS file: /mint/freemint/sys/libkern/kernel_module.h,v
retrieving revision 1.47
diff -u -8 -r1.47 kernel_module.h
--- sys/libkern/kernel_module.h 18 Feb 2013 23:35:35 -0000 1.47
+++ sys/libkern/kernel_module.h 26 Mar 2014 09:44:21 -0000
@@ -945,19 +945,17 @@
# define remaining_proc_time (*KENTRY->vec_misc.remaining_proc_time)
# define trap_1_emu (*KENTRY->vec.misc.trap_1_emu)
# define trap_13_emu (*KENTRY->vec.misc.trap_13_emu)
# define trap_14_emu (*KENTRY->vec.misc.trap_14_emu)
# define ROM_Setexc(vnum,vptr) (void (*)(void))trap_13_emu(0x05,(short)(vnum),(long)(vptr))
-#ifdef XHDI_MASS_STORAGE_SUPPORT
# define xhnewcookie (*KENTRY->vec_misc.XHNewCookie)
-#endif
/*
* kentry_debug
*/
# define DEBUG_LEVEL (*KENTRY->vec_debug.debug_level)
# define KERNEL_TRACE (*KENTRY->vec_debug.trace)
# define KERNEL_DEBUG (*KENTRY->vec_debug.debug)
# define KERNEL_ALERT (*KENTRY->vec_debug.alert)
Index: sys/mint/kentry.h
===================================================================
RCS file: /mint/freemint/sys/mint/kentry.h,v
retrieving revision 1.45
diff -u -8 -r1.45 kentry.h
--- sys/mint/kentry.h 18 Feb 2013 23:35:35 -0000 1.45
+++ sys/mint/kentry.h 26 Mar 2014 09:44:21 -0000
@@ -31,17 +31,16 @@
# ifndef _mint_kentry_h
# define _mint_kentry_h
/* Force mass storage support on so that kernel modules are built correctly for
* all targets. Affects *.km modules, but not xif, xdd, xfs etc.
*
* Do not remove unless you know what you are doing.
*/
-# define XHDI_MASS_STORAGE_SUPPORT
# ifndef __KERNEL__
# error not a KERNEL source
# endif
# include <stdarg.h>
# include "kcompiler.h"
@@ -104,21 +103,18 @@
* ----------
* Every structure size modification *must* increase the major version.
* Every other modifcation must increase the minor version.
*
* major and minor are of type unsigned char. I hope 255 major and minor
* versions are enough :-)
*/
#define KENTRY_MAJ_VERSION 0
-#ifdef XHDI_MASS_STORAGE_SUPPORT
#define KENTRY_MIN_VERSION 18
-#else
-#define KENTRY_MIN_VERSION 17
-#endif
+
/* hardware dependant vector
*/
struct kentry_mch
{
/* global values/flags */
const struct global * const global;
/* for udelay timing loop */
@@ -561,57 +557,38 @@
unsigned long _cdecl (*remaining_proc_time)(void);
/*
* TOS trap vectors
*/
long _cdecl (*trap_1_emu)(short fnum, ...);
long _cdecl (*trap_13_emu)(short fnum, ...);
long _cdecl (*trap_14_emu)(short fnum, ...);
-#ifdef XHDI_MASS_STORAGE_SUPPORT
+
/*
* function to install XHDI drivers
*/
long _cdecl (*XHNewCookie)(void *newcookie);
-#endif
};
-#ifdef XHDI_MASS_STORAGE_SUPPORT
#define DEFAULTS_kentry_misc \
{ \
&dma, \
\
get_toscookie, \
\
add_rsvfentry, \
del_rsvfentry, \
\
remaining_proc_time, \
\
trap_1_emu, \
trap_13_emu, \
trap_14_emu, \
XHNewCookie, \
}
-#else
-#define DEFAULTS_kentry_misc \
-{ \
- &dma, \
- \
- get_toscookie, \
- \
- add_rsvfentry, \
- del_rsvfentry, \
- \
- remaining_proc_time, \
- \
- trap_1_emu, \
- trap_13_emu, \
- trap_14_emu, \
-}
-#endif
/* debug support
*/
struct kentry_debug
{
/* Debugging stuff
* ---------------
*