Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.
On Thu, 16 Sep 1999, Sven LUTHER wrote:
> On Thu, Sep 16, 1999 at 05:12:39AM -0400, Ben Collins wrote:
> > On Thu, Sep 16, 1999 at 02:14:30PM +0200, Sven LUTHER wrote:
> > > ---
> > > /home/luther/Xfree/3.3/debian/xfree86-1-3.3.4/build-tree/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c.orig
> > > Thu Sep 16 07:34:58 1999
> > > +++
> > > /home/luther/Xfree/3.3/debian/xfree86-1-3.3.4/build-tree/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c
> > > Thu Sep 16 07:38:08 1999
> > > @@ -143,6 +143,7 @@
> > >
> > > #endif /* __sparc__ */
> > >
> > > +#ifndef __powerpc__
> > > extern __inline__ void regw(unsigned int regindex, unsigned long regdata)
> > > {
> > > unsigned long appaddr;
> > > @@ -175,6 +176,7 @@
> > > return (*(__volatile__ int *)appaddr);
> > > #endif
> > > }
> > > +#endif /* __powerpc__ */
> > >
> > > extern __inline__ void regwb(unsigned int regindex, unsigned char
> > > regdata)
> > > {
> >
> > I'm not sure this is going to work for sparc, I need to test this out again.
> > I think alot of the mach64 stuff that is #if'd for powerpc could be done for
> > sparc to use it too (the regwb() is one of them).
>
> Have a look at it. I will be away until monday evening, so i can test
> what you come up with. Anyway, best would be to put all the regxxx
> stuff in the same file, and all the different arch version in the same
> function also, like it was started to do with regwbe.
Hmm. Does this patch (what I've been using for 3.3.5 rpms) look alright
all around?
---
Tom Rini (TR1265)
http://gate.crashing.org/~trini/
--- xc/programs/Xserver/hw/xfree68/mach64/Imakefile.origThu Sep 2
17:23:15 1999
+++ xc/programs/Xserver/hw/xfree68/mach64/Imakefile Thu Sep 2 17:23:38 1999
@@ -44,6 +44,7 @@
LinkSourceFile(mach64text.c,../../xfree86/accel/mach64)
LinkSourceFile(mach64win.c,../../xfree86/accel/mach64)
LinkSourceFile(regmach64.h,../../xfree86/accel/mach64)
+LinkSourceFile(mach64util.h,../../xfree86/accel/mach64)
InstallLinkKitLibrary(mach64,$(LINKKITDIR)/drivers)
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.h.orig Thu Sep
2 20:00:27 1999
+++ xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.hThu Sep 2
20:09:31 1999
@@ -143,6 +143,7 @@
#endif /* __sparc__ */
+#ifndef __powerpc__
extern __inline__ void regw(unsigned int regindex, unsigned long regdata)
{
unsigned long appaddr;
@@ -175,6 +176,7 @@
return (*(__volatile__ int *)appaddr);
#endif
}
+#endif /* __powerpc__ */
extern __inline__ void regwb(unsigned int regindex, unsigned char regdata)
{
Re: apt-get configurator for boot-floppies?
> > One advantage for framebuffer is, that you must not know the video card and > > the X server. Video is in the kernel, x-server is fbdev-xserver. For mice > > it is possible to autodetect. Keyboard information comes from the first > > question for the boot-floppy setup. So we need only HorizSync and > > VertRefresh > > for the monitor. Thats all (if the kernel supports your graphic card). > For m68k we have been allowed to include something in xserver-configure. > XF86Config is only copied from the examples directory, the dev/mouse link is > set according to hardware (amiga, atari and mac have different mouse types). Mice is different for powerpc, we can have any serial, ps/2, usb (not yet) and the adb types. > There are no changes to the config file with regards to Hor/Vert > frequencies, since these are set (at least on my machine) during boot or > even before. Nearly all graphiccards supports much higher frequencies monitors can stay with it. Not everyone has a 21" with 250MHz :-) > You can adjust them with fbset AFAIK for some grafics boards. I'm the maintainer for fbset ... > Do you really have to change these frequencies during X setup or is it nice > to have? I mean, if the console works, so does xfree, thats the framebuffer. For the start (boot-floppies) it is enough to have console == x11, but we can use also Modelines (for accel, mode switching, ...) and then it is good to have the HorizSync and VertRefresh available. Greetings, Hartmut
Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.
On Thu, Sep 16, 1999 at 05:12:39AM -0400, Ben Collins wrote:
> On Thu, Sep 16, 1999 at 02:14:30PM +0200, Sven LUTHER wrote:
> > ---
> > /home/luther/Xfree/3.3/debian/xfree86-1-3.3.4/build-tree/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c.orig
> > Thu Sep 16 07:34:58 1999
> > +++
> > /home/luther/Xfree/3.3/debian/xfree86-1-3.3.4/build-tree/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c
> >Thu Sep 16 07:38:08 1999
> > @@ -143,6 +143,7 @@
> >
> > #endif /* __sparc__ */
> >
> > +#ifndef __powerpc__
> > extern __inline__ void regw(unsigned int regindex, unsigned long regdata)
> > {
> > unsigned long appaddr;
> > @@ -175,6 +176,7 @@
> > return (*(__volatile__ int *)appaddr);
> > #endif
> > }
> > +#endif /* __powerpc__ */
> >
> > extern __inline__ void regwb(unsigned int regindex, unsigned char regdata)
> > {
>
> I'm not sure this is going to work for sparc, I need to test this out again.
> I think alot of the mach64 stuff that is #if'd for powerpc could be done for
> sparc to use it too (the regwb() is one of them).
Have a look at it. I will be away until monday evening, so i can test
what you come up with. Anyway, best would be to put all the regxxx
stuff in the same file, and all the different arch version in the same
function also, like it was started to do with regwbe.
Friendly,
Sven LUTHER
Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.
On Thu, Sep 16, 1999 at 02:11:49PM +0200, Christian T. Steigies wrote: > On Thu, 16 Sep 1999, Sven LUTHER wrote: > > > On Thu, Sep 16, 1999 at 09:24:17AM +0200, Sven LUTHER wrote: > > Oops a little mistake came up because of the haste, correct patch is > > attached > Just a quick question, for building xfree on m68k I had to remove mach64, > imstt and pm2 from some Imakefile, since we do not (yet?) want to build > mach64 on m68k, it simly doesnt compile. > Does your patch include that, take care of m68k needs? No, i don't know about m68k, i have no time to compile under it. It was just a quick fix. you should get the afb fix though, Friendly, Sven LUTHER
Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.
On Thu, Sep 16, 1999 at 04:29:06AM -0400, Ben Collins wrote: > On Thu, Sep 16, 1999 at 09:24:17AM +0200, Sven LUTHER wrote: > > --- xc/programs/Xserver/hw/xfree68/mach64/Imakefile.origWed Sep 15 > > 18:24:42 1999 > > +++ xc/programs/Xserver/hw/xfree68/mach64/Imakefile Wed Sep 15 18:25:04 1999 > > @@ -49,7 +49,7 @@ > > LinkSourceFile(mach64pntwn.c,../../xfree86/accel/mach64) > > LinkSourceFile(mach64seg.c,../../xfree86/accel/mach64) > > LinkSourceFile(mach64text.c,../../xfree86/accel/mach64) > > -LinkSourceFile(mach64util.c,../../xfree86/accel/mach64) > > +LinkSourceFile(mach64util.h,../../xfree86/accel/mach64) > > LinkSourceFile(mach64win.c,../../xfree86/accel/mach64) > > LinkSourceFile(regmach64.h,../../xfree86/accel/mach64) > > What happened to the patch in 3.3.4-1 that converted the whole mach64util.h > file > to mach64util.c? Don't know, i just had a look into it to make it compile yesterday. Friendly, Sven LUTHER
Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.
On Thu, Sep 16, 1999 at 02:14:30PM +0200, Sven LUTHER wrote:
> ---
> /home/luther/Xfree/3.3/debian/xfree86-1-3.3.4/build-tree/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c.orig
> Thu Sep 16 07:34:58 1999
> +++
> /home/luther/Xfree/3.3/debian/xfree86-1-3.3.4/build-tree/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c
> Thu Sep 16 07:38:08 1999
> @@ -143,6 +143,7 @@
>
> #endif /* __sparc__ */
>
> +#ifndef __powerpc__
> extern __inline__ void regw(unsigned int regindex, unsigned long regdata)
> {
> unsigned long appaddr;
> @@ -175,6 +176,7 @@
> return (*(__volatile__ int *)appaddr);
> #endif
> }
> +#endif /* __powerpc__ */
>
> extern __inline__ void regwb(unsigned int regindex, unsigned char regdata)
> {
I'm not sure this is going to work for sparc, I need to test this out again.
I think alot of the mach64 stuff that is #if'd for powerpc could be done for
sparc to use it too (the regwb() is one of them).
Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.
On Thu, Sep 16, 1999 at 09:24:17AM +0200, Sven LUTHER wrote: > --- xc/programs/Xserver/hw/xfree68/mach64/Imakefile.orig Wed Sep 15 > 18:24:42 1999 > +++ xc/programs/Xserver/hw/xfree68/mach64/Imakefile Wed Sep 15 18:25:04 1999 > @@ -49,7 +49,7 @@ > LinkSourceFile(mach64pntwn.c,../../xfree86/accel/mach64) > LinkSourceFile(mach64seg.c,../../xfree86/accel/mach64) > LinkSourceFile(mach64text.c,../../xfree86/accel/mach64) > -LinkSourceFile(mach64util.c,../../xfree86/accel/mach64) > +LinkSourceFile(mach64util.h,../../xfree86/accel/mach64) > LinkSourceFile(mach64win.c,../../xfree86/accel/mach64) > LinkSourceFile(regmach64.h,../../xfree86/accel/mach64) What happened to the patch in 3.3.4-1 that converted the whole mach64util.h file to mach64util.c? Ben
Re: apt-get configurator for boot-floppies?
Moin Hartmut, On Wed, 15 Sep 1999, Hartmut Koptein wrote: > One advantage for framebuffer is, that you must not know the video card and > the X server. Video is in the kernel, x-server is fbdev-xserver. For mice > it is possible to autodetect. Keyboard information comes from the first > question for the boot-floppy setup. So we need only HorizSync and VertRefresh > for the monitor. Thats all (if the kernel supports your graphic card). For m68k we have been allowed to include something in xserver-configure. XF86Config is only copied from the examples directory, the dev/mouse link is set according to hardware (amiga, atari and mac have different mouse types). There are no changes to the config file with regards to Hor/Vert frequencies, since these are set (at least on my machine) during boot or even before. You can adjust them with fbset AFAIK for some grafics boards. Do you really have to change these frequencies during X setup or is it nice to have? I mean, if the console works, so does xfree, thats the framebuffer. Ciao, Christian.
Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.
On Thu, 16 Sep 1999, Sven LUTHER wrote: > On Thu, Sep 16, 1999 at 09:24:17AM +0200, Sven LUTHER wrote: > Oops a little mistake came up because of the haste, correct patch is attached Just a quick question, for building xfree on m68k I had to remove mach64, imstt and pm2 from some Imakefile, since we do not (yet?) want to build mach64 on m68k, it simly doesnt compile. Does your patch include that, take care of m68k needs? Ciao, Christian.
Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.
On Thu, Sep 16, 1999 at 09:24:17AM +0200, Sven LUTHER wrote:
>
Oops a little mistake came up because of the haste, correct patch is attached
...
> Friendly,
>
> Sven LUTHER
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c.orig Wed Sep 15
17:01:53 1999
+++ xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c Wed Sep 15
17:03:55 1999
@@ -76,11 +76,12 @@
unsigned int integer;
unsigned char bytes[4];
};
-
+/* Also defined in regmach64.h ...
static __inline__ void regwbe(volatile unsigned long regindex, unsigned long
regdata)
{
*(unsigned long *)(mach64MemReg + regindex) = regdata;
}
+*/
static __inline__ unsigned int bit_reverse32(unsigned int bits)
{
--- xc/programs/Xserver/hw/xfree68/mach64/Imakefile.origWed Sep 15
18:24:42 1999
+++ xc/programs/Xserver/hw/xfree68/mach64/Imakefile Wed Sep 15 18:25:04 1999
@@ -49,7 +49,7 @@
LinkSourceFile(mach64pntwn.c,../../xfree86/accel/mach64)
LinkSourceFile(mach64seg.c,../../xfree86/accel/mach64)
LinkSourceFile(mach64text.c,../../xfree86/accel/mach64)
-LinkSourceFile(mach64util.c,../../xfree86/accel/mach64)
+LinkSourceFile(mach64util.h,../../xfree86/accel/mach64)
LinkSourceFile(mach64win.c,../../xfree86/accel/mach64)
LinkSourceFile(regmach64.h,../../xfree86/accel/mach64)
---
/home/luther/Xfree/3.3/debian/xfree86-1-3.3.4/build-tree/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c.orig
Thu Sep 16 07:34:58 1999
+++
/home/luther/Xfree/3.3/debian/xfree86-1-3.3.4/build-tree/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c
Thu Sep 16 07:38:08 1999
@@ -143,6 +143,7 @@
#endif /* __sparc__ */
+#ifndef __powerpc__
extern __inline__ void regw(unsigned int regindex, unsigned long regdata)
{
unsigned long appaddr;
@@ -175,6 +176,7 @@
return (*(__volatile__ int *)appaddr);
#endif
}
+#endif /* __powerpc__ */
extern __inline__ void regwb(unsigned int regindex, unsigned char regdata)
{
xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.
Hello,
I fixed the mach64 build problem on fbdev and powerpc, i just had time to fix
it this morning before going to work, but was not able to build the full debian
packages. I will be away until monday, so if someone want to apply this patch
and rebuild the packages, go ahead.
There was a problem in the Imakefile, so i guess nobody built xfree68 before,
and also a multiple definition of regwbe, regw and regr.
I don't know what is the right place for defining this stuff, so please decide
on it and stick on it. regwbe wasdefined for powerpc in mach64im.c, but
redefined in regmach64.h, without being removed from mach64im.c. regw and regr
are defined in mach64util.h, but not their ppc version which is defined in
regmach64.h
So anyway, here i attach the patch i did, bear in mind that it is a quick fix
and not a clean and definitive solution.
Friendly,
Sven LUTHER
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c.orig Wed Sep 15
17:01:53 1999
+++ xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c Wed Sep 15
17:03:55 1999
@@ -76,11 +76,12 @@
unsigned int integer;
unsigned char bytes[4];
};
-
+/* Also defined in regmach64.h ...
static __inline__ void regwbe(volatile unsigned long regindex, unsigned long
regdata)
{
*(unsigned long *)(mach64MemReg + regindex) = regdata;
}
+*/
static __inline__ unsigned int bit_reverse32(unsigned int bits)
{
--- xc/programs/Xserver/hw/xfree68/mach64/Imakefile.origWed Sep 15
18:24:42 1999
+++ xc/programs/Xserver/hw/xfree68/mach64/Imakefile Wed Sep 15 18:25:04 1999
@@ -49,7 +49,7 @@
LinkSourceFile(mach64pntwn.c,../../xfree86/accel/mach64)
LinkSourceFile(mach64seg.c,../../xfree86/accel/mach64)
LinkSourceFile(mach64text.c,../../xfree86/accel/mach64)
-LinkSourceFile(mach64util.c,../../xfree86/accel/mach64)
+LinkSourceFile(mach64util.h,../../xfree86/accel/mach64)
LinkSourceFile(mach64win.c,../../xfree86/accel/mach64)
LinkSourceFile(regmach64.h,../../xfree86/accel/mach64)
---
/home/luther/Xfree/3.3/debian/xfree86-1-3.3.4/build-tree/xc/programs/Xserver/hw/xfree68/mach64/mach64util.h.orig
Thu Sep 16 07:34:58 1999
+++
/home/luther/Xfree/3.3/debian/xfree86-1-3.3.4/build-tree/xc/programs/Xserver/hw/xfree68/mach64/mach64util.h
Thu Sep 16 07:38:08 1999
@@ -143,6 +143,7 @@
#endif /* __sparc__ */
+#ifndef __powerpc__
extern __inline__ void regw(unsigned int regindex, unsigned long regdata)
{
unsigned long appaddr;
@@ -175,6 +176,7 @@
return (*(__volatile__ int *)appaddr);
#endif
}
+#endif /* __powerpc__ */
extern __inline__ void regwb(unsigned int regindex, unsigned char regdata)
{
Re: apt-get configurator for boot-floppies?
> For PCI users, I remember someone on #debian-devel had done a little > script that could pick your video card and X server. One of the most > confusing things for new users is picking the vid card. The script > worked cross platform (so long as it was PCI). I don't remember the > name of it or who did it. That was me. I posted a message here a couple of weeks ago, and didn't get any responses. I'd be happy to help in whatever way I can. The script detects a lot of common pci cards, and can in theory detect any pci card provided we match up the pci id with the appropriate X driver. I am also look at doing some detection using the fb devices on different platforms (e.g. sparc), but i don't have any info about that yet. randolph -- Debian Developer <[EMAIL PROTECTED]> http://www.TauSq.org/
