Port-mac68k archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: mac68k built-in video (PR#58164)



Hi Robert,

On 6/9/24 10:11 AM, Robert Swindells wrote:
> 
> I have this in my tree, may help:
> 
> Index: macfb.c
> ===================================================================
> RCS file: /cvsroot/src/sys/arch/mac68k/dev/macfb.c,v
> retrieving revision 1.23
> diff -u -r1.23 macfb.c
> --- macfb.c     7 Aug 2021 16:18:57 -0000       1.23
> +++ macfb.c     9 Jun 2024 16:08:54 -0000
> @@ -197,6 +197,7 @@
>         int isconsole;
>  
>         sc = device_private(self);
> +       sc->sc_dev = self;
>  
>         printf("\n");
>  
> 

Thanks for that patch. I wasn't able to apply it using the patch program
(perhaps I was using an incorrect option). So I just added the line
"sc->sc_dev = self;" after "sc = device_private(self);".

$ diff -u macfb.c macfb.c.orig
--- macfb.c	2024-06-09 18:49:42.952876822 -0600
+++ macfb.c.orig	2024-06-09 19:07:22.883676407 -0600
@@ -197,7 +197,6 @@
 	int isconsole;

 	sc = device_private(self);
-	sc->sc_dev = self;

 	printf("\n");

Compilation fails here:

#   compile  MACIICI/macfb.o
/usr/src/obj/tooldir.NetBSD-10.0-i386/bin/m68k--netbsdelf-gcc
-msoft-float -ffreestanding -fno-zero-initialized-in-bss
-fno-delete-null-pointer-checks -Os -m68030 -fno-reorder-blocks
-fno-omit-frame-pointer -fstack-usage -Wstack-usage=3584
-fno-strict-aliasing -fno-common -std=gnu99 -Werror -Wall -Wno-main
-Wno-format-zero-length -Wpointer-arith -Wmissing-prototypes
-Wstrict-prototypes -Wold-style-definition -Wswitch -Wshadow -Wcast-qual
-Wwrite-strings -Wno-unreachable-code -Wno-pointer-sign -Wno-attributes
-Wno-type-limits -Wno-sign-compare -Walloca
-Wno-address-of-packed-member --sysroot=/usr/src/obj/destdir.mac68k
-Dmac68k -I. -I../../../../external/bsd/libnv/dist
-I../../../../external/bsd/acpica/dist
-I../../../../../common/lib/libx86emu
-I../../../../../common/lib/libc/misc -I../../../../../common/include
-I../../../../arch -I../../../.. -nostdinc -DCOMPAT_UTILS -DCOMPAT_44
-D_KERNEL -D_KERNEL_OPT -std=gnu99
-I../../../../lib/libkern/../../../common/lib/libc/quad
-I../../../../lib/libkern/../../../common/lib/libc/string
-I../../../../lib/libkern/../../../common/lib/libc/arch/m68k/string
-I../../../../lib/libkern/../../../common/lib/libc/arch/m68k/atomic
-I../../../../lib/libkern/../../../common/lib/libc/hash/sha3
-I../../../../external/bsd/libnv/dist -c
../../../../arch/mac68k/dev/macfb.c -o macfb.o
../../../../arch/mac68k/dev/macfb.c: In function 'macfb_attach':
../../../../arch/mac68k/dev/macfb.c:200:6: error: 'struct macfb_softc'
has no member named 'sc_dev'; did you mean 'sc_dc'?
  200 |  sc->sc_dev = self;
      |      ^~~~~~
      |      sc_dc

*** Failed target:  macfb.o

Do I need to download a specific git tree before applying the patch?

thanks

-Stan


Home | Main Index | Thread Index | Old Index