Re: Working towards 2.2.0: Cosmetics..

Guest section DW (dwguest@win.tue.nl)
Thu, 7 Jan 1999 20:25:24 +0100 (MET)


From: alan@lxorguk.ukuu.org.uk (Alan Cox)
To: rickettm@ox.compsoc.net

> {
> int e8390_base = dev->base_addr;
> - struct ei_device *ei_local = (struct ei_device *) dev->priv;
>
> outb_p(E8390_NODMA+E8390_PAGE0, e8390_base+E8390_CMD);
>
> > awe_compat.h:181: warning: `my_realloc' defined but not used
>
> As far as I can see it is safe to remove this, but I'm prepared to be told
> otherwise.

It isnt safe to remove them. The E8390_* macros for some platforms use
ei_local to get at a register mapping table (this is needed because on the
Mac for example Dayna cards are 4*register spaced, Apple cards are 1* spaced
but in reverse register order -- and so on)

Yes. If I am not mistaken the following would work, however:

# diff -u 8390.h~ 8390.h
--- 8390.h~ Sun Jan 3 23:06:20 1999
+++ 8390.h Thu Jan 7 20:20:03 1999
@@ -215,6 +215,7 @@
#if defined(CONFIG_MAC) || defined(CONFIG_AMIGA_PCMCIA) || \
defined(CONFIG_ARIADNE2) || defined(CONFIG_ARIADNE2_MODULE)
#define EI_SHIFT(x) (ei_local->reg_offset[x])
+#define EI_LOCAL_NEEDED_FOR_EI_SHIFT
#else
#define EI_SHIFT(x) (x)
#endif

# diff -u 8390.c~ 8390.c
--- 8390.c~ Fri Jan 1 15:25:07 1999
+++ 8390.c Thu Jan 7 20:20:46 1999
@@ -1089,7 +1089,9 @@
int start_page)
{
int e8390_base = dev->base_addr;
- struct ei_device *ei_local = (struct ei_device *) dev->priv;
+#ifdef EI_LOCAL_NEEDED_FOR_EI_SHIFT
+ struct ei_device *ei_local = (struct ei_device *) dev->priv;
+#endif

outb_p(E8390_NODMA+E8390_PAGE0, e8390_base+E8390_CMD);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/