Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Michal Mertl wrote: Jay O'Brien pe v po 11. 04. 2005 v 00:43 -0700: Michal, The md5 results for vidcontrol.diff.20050215 are the same as yours. The other files, however, are different. I first did fetch http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/vidcontrol/vidcontrol.c fetch http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/vidcontrol/vidcontrol.1 to get the files. I now see this doesn't get the correct files. Rather, it gets files marked up for the web. Obviously that was a big problem. Then, using WinXP Pro and Mozilla, I downloaded the files again from http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/vidcontrol/ and I moved them to the FreeBSD machine using WS_FTP Pro. Different md5 results again. I found that now the first hunk of the patch on vidcontrol.1 failed. After much file comparing, I found the differences in the files. The $FreeBSD line near the beginning of each file had /repoman/r/ncvs/ in front of src/user.sbin/... and when I edited those characters out, the md5 results were the same as yours, and the patch completed without errors. I found that the vidcontrol.c file would patch ok without editing out those characters, but the vidcontrol.1 file would error in hunk #1 if /repoman/r/ncvs/ was present. I see. Sorry about that. I didn't actually retrieve my files from cvsweb, I have a local copy of the repository. I rebuilt the kernel with SC_PIXEL MODE and VESA. When it rebooted, I got 16 lines of vidcontrol: showing the mouse: Invalid argument which I see from a google search is a common problem. Yes. I didn't look into it. Do you see this problem on your system? Whenever I select a mode with more than 80 characters the screen goes black. I'm afraid I've never seen this. I loaded cp837-8x8 font, but no change. I suppose you mean 437. It shouldn't be important. Yes, 437. My typo. sorry. I have the following in /etc/rc.conf, to set up 80x50, could it be the problem? font8x8=iso08-8x8 font8x14=iso08-8x14 font8x16=iso08-8x16 scrnmap=iso-8859-1_to_cp437 allscreens_flags=-m on 80x50 white black I didn't try it lately. I just used vidcontrol manually. Or perhaps this that I have now in /etc/ttys? ttyv0 /usr/libexec/getty Pc cons50 on secure # Virtual terminals ttyv1 /usr/libexec/getty Pc cons50 on secure ttyv2 /usr/libexec/getty Pc cons50 on secure ttyv3 /usr/libexec/getty Pc cons50 on secure ttyv4 /usr/libexec/getty Pc cons50 on secure ttyv5 /usr/libexec/getty Pc cons50 on secure ttyv6 /usr/libexec/getty Pc cons50 on secure At least now I can see what MAY be possible; vidcontrol -i mode returns a screenful of fonts to try. Tomorrow I'll identify which ones work and which ones don't. This is a part of my 'vidcontrol -i mode' command output: Where is this display explained? flags, type, window, linear buffer? It isn't in MAN VIDCONTROL mode# flags type size font window linear -- 24 (0x018) 0x0001 T 80x25 8x16 0xb8000 30 (0x01e) 0x0001 T 80x50 8x8 0xb8000 32 (0x020) 0x0001 T 80x30 8x16 0xb8000 34 (0x022) 0x0001 T 80x60 8x8 0xb8000 My modes 24,30,32 and 34 are identical to yours. 259 (0x103) 0x000f G 800x600x8 1 8x14 275 (0x113) 0x000f G 800x600x15 1 8x14 276 (0x114) 0x000f G 800x600x16 1 8x14 277 (0x115) 0x000f G 800x600x24 1 8x14 My modes 259,275,276,277 all show 0x000b and 8x16; otherwise the same. 290 (0x122) 0x000f G 800x600x32 1 8x14 I don't have mode 290. To set the desired mode use vidcontrol MODE_mode#. From the modes listed here mode 259 can't be used (it's 8bpp mode which isn't supported). Yes, that works fine. To be able to use a mode you must have the appropriate font loaded. Command 'vidcontrol -f /usr/share/syscons/fonts/cp437-8x14.fnt' may be used to use some 8x14 font. You should have loaded all for resolutions' fonts though because they're listed at rc.conf. I really don't see what you've done wrong this time, sorry. From my experience vidcontrol allows you to switch to a desired mode only if it's possble - the appopriate font is loaded and in case you ask for graphics mode SC_PIXEL_MODE is defined and the mode has supported color depth. I tested it all again and it works for me flawlessly. Michal Here's my observations now. Does this suggest any actions to try? I note that consoles ttyv1-7 are now 80x25, not 80x50 as I had them set up before. I can go to each, type vidcontrol MODE_30 to put that virtual console into 80x50 mode. ttyv0, however, starts up in 80x50 as before. I have 45 modes in my vidcontrol -i mode display. 21 work fine, many are useless because they are large and coarse. However, one new one to me, 258, is very useful as it is 100x75, much better than 80x50. The ones that work are
Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Michal Mertl wrote: Jay O'Brien wrote: Michal Mertl wrote: What? I don't know how the patching of vidcontrol ended but you'd better redo it with fresh files from current. Go download vidcontrol.c v 1.48 and vidcontrol.1 from http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/vidcontrol/ Then run the patch on it again and recompile/reinstall vidcontrol binary. I did that. The files are vidcontrol.1 Rev 1.55 and Vidcontrol.c Rev 1.48. Now all hunks failed. The results are below. I don't know. The text before the line starting with Patching is taken from the patch file. The patch program doesn't retrieve any files. So I think you either used bad files to patch or bad patchfile. You need to have the original files. To check they're correct you can use md5 utility. md5 vidcontrol.c MD5 (vidcontrol.c) = 1068e5a6aff863e2bc7a0c02098d43b1 md5 vidcontrol.1 MD5 (vidcontrol.1) = 080d2b84f2e3914090279fee6e5f2406 md5 vidcontrol.diff.20050215 MD5 (vidcontrol.diff.20050215) = 67ae12fe2a4fecae1bb7adb141efe021 You need to see the same strings. Then command 'patch /path/to/vidcontro.diff.20050215' must work. Michal Michal, The md5 results for vidcontrol.diff.20050215 are the same as yours. The other files, however, are different. I first did fetch http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/vidcontrol/vidcontrol.c fetch http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/vidcontrol/vidcontrol.1 to get the files. I now see this doesn't get the correct files. Rather, it gets files marked up for the web. Obviously that was a big problem. Then, using WinXP Pro and Mozilla, I downloaded the files again from http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/vidcontrol/ and I moved them to the FreeBSD machine using WS_FTP Pro. Different md5 results again. I found that now the first hunk of the patch on vidcontrol.1 failed. After much file comparing, I found the differences in the files. The $FreeBSD line near the beginning of each file had /repoman/r/ncvs/ in front of src/user.sbin/... and when I edited those characters out, the md5 results were the same as yours, and the patch completed without errors. I found that the vidcontrol.c file would patch ok without editing out those characters, but the vidcontrol.1 file would error in hunk #1 if /repoman/r/ncvs/ was present. I rebuilt the kernel with SC_PIXEL MODE and VESA. When it rebooted, I got 16 lines of vidcontrol: showing the mouse: Invalid argument which I see from a google search is a common problem. Whenever I select a mode with more than 80 characters the screen goes black. I loaded cp837-8x8 font, but no change. I have the following in /etc/rc.conf, to set up 80x50, could it be the problem? font8x8=iso08-8x8 font8x14=iso08-8x14 font8x16=iso08-8x16 scrnmap=iso-8859-1_to_cp437 allscreens_flags=-m on 80x50 white black Or perhaps this that I have now in /etc/ttys? ttyv0 /usr/libexec/getty Pc cons50 on secure # Virtual terminals ttyv1 /usr/libexec/getty Pc cons50 on secure ttyv2 /usr/libexec/getty Pc cons50 on secure ttyv3 /usr/libexec/getty Pc cons50 on secure ttyv4 /usr/libexec/getty Pc cons50 on secure ttyv5 /usr/libexec/getty Pc cons50 on secure ttyv6 /usr/libexec/getty Pc cons50 on secure At least now I can see what MAY be possible; vidcontrol -i mode returns a screenful of fonts to try. Tomorrow I'll identify which ones work and which ones don't. What next? Jay O'Brien Rio Linda, California, USA ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Michal Mertl wrote: Didier Wiroth wrote: Hi, I'm using freebsd 5.4-prerelease on my laptop. My laptop has an ati mobility radeon 9600. Unfortunately it has very poor console vesa support. SC_PIXEL_MODE does not work, 90x60 is the highest resolution I can get for now. It looks like I'm not the only one having this problem with ati chipsets: http://www.freebsd.org/cgi/getmsg.cgi?fetch=1091839+1096057+/usr/local/w ww/db/text/2005/freebsd-questions/20050123.freebsd-questions I saw this posting: http://lists.freebsd.org/pipermail/freebsd-current/2004-August/035621.ht ml Unfortunately I'm not a programmer and have no ... to very poor patching skills. It looks to me, that in this posting(s) a few patches are grouped together to enable vesa 1024x768. 1) Has someone applied this patches? 2) As the patch(es) is/are on the entire page, I don't know how to separate them. Would someone mail me as an attachment the different patches and tell me how I should apply them: for example, mail me patch1, patch2, patch3 and the explanation how to patch them: cd /usr/src patch ~/patch1 patch ~/patch2 ...etc I think the newest and probably best (?) patch was prepared by Xin Li ([EMAIL PROTECTED]) who is also committer. I sent this email to him (or she? - sorry about that) in case he has some comments. Beware that he said he experienced some problems with previous version of the patch. I haven't tested this version of the patch myself but it at least compiles. It's available at http://people.freebsd.org/~delphij/vesa/ in files syscons.diff.20050215 and vidcontrol.diff.20050215 You would apply them with: cd /usr/src/sys/dev/syscons patch /path/syscons.diff.20050215 cd /usr/src/usr.sbin/vidcontrol patch /path/vidcontrol.diff.20050215 make clean make all make install You need also to rebuild and reinstall the kernel. You must have 'options SC_PIXEL_MODE' in your kernel config. You also need to have VESA available - you can load it with kldload vesa or include it in the kernel with 'options VESA'. After reboot with the new kernel you should be able to get list of all VESA and standard modes your card support with 'vidcontrol -i mode'. To be able to use them as your console mode you need to have the appropriate font loaded. The font resolution is seen in vidcontrol output in the 'font' column. To load the font 8x8 you can use 'vidcontrol -f /usr/share/syscons/fonts/cp437-8x8.fnt' or similar. To set the mode use 'vidcontrol MODE_$num' where $num is the mode number (first column in 'vidcontrol -i mode' output). HTH Michal I feel like I am missing a lot here. I want to display 132 characters per line on my console. I am not running X Windows and it is not a notebook. I am running 5.3-RELEASE-p5 #0. What is this SC_PIXEL_MODE and where may I find documentation on it? I don't find it in /usr/src/sys/i386/conf/NOTES. To rebuild and reinstall the kernel, after editing my /usr/src/sys/i386/conf/GENERIC to insert 'options SC_PIXEL_MODE', would I 'make buildkernel' and then 'make installkernel' or is there something else I'm missing? I note that some of the messages are posted to multiple mailing lists, and I suspect that as I only read [EMAIL PROTECTED] I'm not seeing the entire story. Jay O'Brien Rio Linda, California USA ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Jay O'Brien wrote: Michal Mertl wrote: Didier Wiroth wrote: Hi, I'm using freebsd 5.4-prerelease on my laptop. My laptop has an ati mobility radeon 9600. Unfortunately it has very poor console vesa support. SC_PIXEL_MODE does not work, 90x60 is the highest resolution I can get for now. It looks like I'm not the only one having this problem with ati chipsets: http://www.freebsd.org/cgi/getmsg.cgi?fetch=1091839+1096057+/usr/local/w ww/db/text/2005/freebsd-questions/20050123.freebsd-questions I saw this posting: http://lists.freebsd.org/pipermail/freebsd-current/2004-August/035621.ht ml Unfortunately I'm not a programmer and have no ... to very poor patching skills. It looks to me, that in this posting(s) a few patches are grouped together to enable vesa 1024x768. 1) Has someone applied this patches? 2) As the patch(es) is/are on the entire page, I don't know how to separate them. Would someone mail me as an attachment the different patches and tell me how I should apply them: for example, mail me patch1, patch2, patch3 and the explanation how to patch them: cd /usr/src patch ~/patch1 patch ~/patch2 ...etc I think the newest and probably best (?) patch was prepared by Xin Li ([EMAIL PROTECTED]) who is also committer. I sent this email to him (or she? - sorry about that) in case he has some comments. Beware that he said he experienced some problems with previous version of the patch. I haven't tested this version of the patch myself but it at least compiles. It's available at http://people.freebsd.org/~delphij/vesa/ in files syscons.diff.20050215 and vidcontrol.diff.20050215 You would apply them with: cd /usr/src/sys/dev/syscons patch /path/syscons.diff.20050215 cd /usr/src/usr.sbin/vidcontrol patch /path/vidcontrol.diff.20050215 make clean make all make install You need also to rebuild and reinstall the kernel. You must have 'options SC_PIXEL_MODE' in your kernel config. You also need to have VESA available - you can load it with kldload vesa or include it in the kernel with 'options VESA'. After reboot with the new kernel you should be able to get list of all VESA and standard modes your card support with 'vidcontrol -i mode'. To be able to use them as your console mode you need to have the appropriate font loaded. The font resolution is seen in vidcontrol output in the 'font' column. To load the font 8x8 you can use 'vidcontrol -f /usr/share/syscons/fonts/cp437-8x8.fnt' or similar. To set the mode use 'vidcontrol MODE_$num' where $num is the mode number (first column in 'vidcontrol -i mode' output). HTH Michal I feel like I am missing a lot here. I want to display 132 characters per line on my console. I am not running X Windows and it is not a notebook. It doesn't matter. I only saw the most complaints from notebook owners who didn't have text mode console covering all LCD surface. I am running 5.3-RELEASE-p5 #0. What is this SC_PIXEL_MODE and where may I find documentation on it? I don't find it in /usr/src/sys/i386/conf/NOTES. man syscons(4). It's also mentioned in NOTES although not the NOTES you were looking at. Don't forget that on 5.x there are two conf directories - one platform independent in /sys/conf and other in /sys/$ARCH/conf. Common (platform independent) options like this one are in /sys/conf/NOTES. To rebuild and reinstall the kernel, after editing my /usr/src/sys/i386/conf/GENERIC to insert 'options SC_PIXEL_MODE', would I 'make buildkernel' and then 'make installkernel' or is there something else I'm missing? No, that's the way to do it. I note that some of the messages are posted to multiple mailing lists, and I suspect that as I only read [EMAIL PROTECTED] I'm not seeing the entire story. I'm afraid that's quite possible. Please go search the archives. Jay O'Brien Rio Linda, California USA Michal Mertl Prague, Bohemia, Czech Republic :-) ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Michal Mertl wrote: Jay O'Brien wrote: Michal Mertl wrote: Didier Wiroth wrote: Hi, I'm using freebsd 5.4-prerelease on my laptop. My laptop has an ati mobility radeon 9600. Unfortunately it has very poor console vesa support. SC_PIXEL_MODE does not work, 90x60 is the highest resolution I can get for now. It looks like I'm not the only one having this problem with ati chipsets: http://www.freebsd.org/cgi/getmsg.cgi?fetch=1091839+1096057+/usr/local/w ww/db/text/2005/freebsd-questions/20050123.freebsd-questions I saw this posting: http://lists.freebsd.org/pipermail/freebsd-current/2004-August/035621.ht ml Unfortunately I'm not a programmer and have no ... to very poor patching skills. It looks to me, that in this posting(s) a few patches are grouped together to enable vesa 1024x768. 1) Has someone applied this patches? 2) As the patch(es) is/are on the entire page, I don't know how to separate them. Would someone mail me as an attachment the different patches and tell me how I should apply them: for example, mail me patch1, patch2, patch3 and the explanation how to patch them: cd /usr/src patch ~/patch1 patch ~/patch2 ...etc I think the newest and probably best (?) patch was prepared by Xin Li ([EMAIL PROTECTED]) who is also committer. I sent this email to him (or she? - sorry about that) in case he has some comments. Beware that he said he experienced some problems with previous version of the patch. I haven't tested this version of the patch myself but it at least compiles. It's available at http://people.freebsd.org/~delphij/vesa/ in files syscons.diff.20050215 and vidcontrol.diff.20050215 You would apply them with: cd /usr/src/sys/dev/syscons patch /path/syscons.diff.20050215 cd /usr/src/usr.sbin/vidcontrol patch /path/vidcontrol.diff.20050215 make clean make all make install You need also to rebuild and reinstall the kernel. You must have 'options SC_PIXEL_MODE' in your kernel config. You also need to have VESA available - you can load it with kldload vesa or include it in the kernel with 'options VESA'. After reboot with the new kernel you should be able to get list of all VESA and standard modes your card support with 'vidcontrol -i mode'. To be able to use them as your console mode you need to have the appropriate font loaded. The font resolution is seen in vidcontrol output in the 'font' column. To load the font 8x8 you can use 'vidcontrol -f /usr/share/syscons/fonts/cp437-8x8.fnt' or similar. To set the mode use 'vidcontrol MODE_$num' where $num is the mode number (first column in 'vidcontrol -i mode' output). HTH Michal I feel like I am missing a lot here. I want to display 132 characters per line on my console. I am not running X Windows and it is not a notebook. It doesn't matter. I only saw the most complaints from notebook owners who didn't have text mode console covering all LCD surface. I am running 5.3-RELEASE-p5 #0. What is this SC_PIXEL_MODE and where may I find documentation on it? I don't find it in /usr/src/sys/i386/conf/NOTES. man syscons(4). It's also mentioned in NOTES although not the NOTES you were looking at. Don't forget that on 5.x there are two conf directories - one platform independent in /sys/conf and other in /sys/$ARCH/conf. Common (platform independent) options like this one are in /sys/conf/NOTES. Thanks! Now that I see that it is perhaps not required for my system, that is not a laptop, is it possible that I don't need this at all? Is it definitely needed to support 132 character terminal mode, or is just needed for laptops? To rebuild and reinstall the kernel, after editing my /usr/src/sys/i386/conf/GENERIC to insert 'options SC_PIXEL_MODE', would I 'make buildkernel' and then 'make installkernel' or is there something else I'm missing? No, that's the way to do it. I note that some of the messages are posted to multiple mailing lists, and I suspect that as I only read [EMAIL PROTECTED] I'm not seeing the entire story. I'm afraid that's quite possible. Please go search the archives. Jay O'Brien Rio Linda, California USA Michal Mertl Prague, Bohemia, Czech Republic :-) It is wonderful to be a part of a caring community that spans the world, without concern for international borders. Fortunately for me, everyone uses english; I'm stuck with only one language (plus international morse code, but that's another story). Jay O'Brien Rio Linda, California, USA ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Jay O'Brien wrote: Michal Mertl wrote: I feel like I am missing a lot here. I want to display 132 characters per line on my console. I am not running X Windows and it is not a notebook. It doesn't matter. I only saw the most complaints from notebook owners who didn't have text mode console covering all LCD surface. I am running 5.3-RELEASE-p5 #0. What is this SC_PIXEL_MODE and where may I find documentation on it? I don't find it in /usr/src/sys/i386/conf/NOTES. man syscons(4). It's also mentioned in NOTES although not the NOTES you were looking at. Don't forget that on 5.x there are two conf directories - one platform independent in /sys/conf and other in /sys/$ARCH/conf. Common (platform independent) options like this one are in /sys/conf/NOTES. Thanks! Now that I see that it is perhaps not required for my system, that is not a laptop, is it possible that I don't need this at all? Is it definitely needed to support 132 character terminal mode, or is just needed for laptops? There's no standard VGA 132 character text mode. It's either provided by VESA or emulated using some graphics mode. Newer graphics hardware stopped supporting extended text modes. If you want such modes you need to emulate them (render the characters using lots of small dots instead of just writing characters to the adapter which renders them for you). Support for this functionality is included in syscons/vga driver when you define options SC_PIXEL_MODE. Standard FreeBSD supports only planar graphics mode 800x600 dots with 4 bits (16) of color information per pixel which can be run on old plain VGA with 256KB of memory. The patches we are talking about add support for rendering the characters in any graphics mode your card supports (through VESA) with = 15 bits per pixel. You could then run say 1600x1200x32 bpp (16milions of colours) for a text mode console. You can't use any graphics there but the textual resolution will be bigger. There also isn't support for using simultaneously more than 16 (or is it 15?) different colors for characters even when milions are technically possible. It is wonderful to be a part of a caring community that spans the world, without concern for international borders. Fortunately for me, everyone uses english; I'm stuck with only one language (plus international morse code, but that's another story). Yes, it really is great. Not the English though. I'd prefer Czech but I'm afraid it's a lost battle :-). Michal ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Michal Mertl wrote: There's no standard VGA 132 character text mode. It's either provided by VESA or emulated using some graphics mode. Newer graphics hardware stopped supporting extended text modes. If you want such modes you need to emulate them (render the characters using lots of small dots instead of just writing characters to the adapter which renders them for you). Support for this functionality is included in syscons/vga driver when you define options SC_PIXEL_MODE. Standard FreeBSD supports only planar graphics mode 800x600 dots with 4 bits (16) of color information per pixel which can be run on old plain VGA with 256KB of memory. The patches we are talking about add support for rendering the characters in any graphics mode your card supports (through VESA) with = 15 bits per pixel. You could then run say 1600x1200x32 bpp (16milions of colours) for a text mode console. You can't use any graphics there but the textual resolution will be bigger. There also isn't support for using simultaneously more than 16 (or is it 15?) different colors for characters even when milions are technically possible. Thanks for the explanation, it is appreciated. I tried the process and encountered errors. Here's what happened: patch /tmp/syscons.diff.20050215 this went fine. patch /tmp/vidcontrol.diff.20050215 returned errors as shown below: # patch /tmp/vidcontrol.diff.20050215 Hmm... Looks like a unified diff to me... The text leading up to this was: -- |Index: vidcontrol.1 |=== |RCS file: /home/ncvs/src/usr.sbin/vidcontrol/vidcontrol.1,v |retrieving revision 1.55 |diff -u -r1.55 vidcontrol.1 |--- vidcontrol.1 2 Mar 2003 21:04:21 - 1.55 |+++ vidcontrol.1 17 Jan 2005 05:27:25 - -- Patching file vidcontrol.1 using Plan A... Hunk #1 succeeded at 11. Hunk #2 succeeded at 88. Hunk #3 succeeded at 297. Hunk #4 succeeded at 532. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: vidcontrol.c |=== |RCS file: /home/ncvs/src/usr.sbin/vidcontrol/vidcontrol.c,v |retrieving revision 1.48 |diff -u -r1.48 vidcontrol.c |--- vidcontrol.c 13 Jan 2005 03:59:44 - 1.48 |+++ vidcontrol.c 17 Jan 2005 05:27:25 - -- Patching file vidcontrol.c using Plan A... Hunk #1 succeeded at 24. Hunk #2 succeeded at 48. Hunk #3 succeeded at 66 with fuzz 1. Hunk #4 failed at 187. Hunk #5 succeeded at 223. Hunk #6 failed at 239. Hunk #7 failed at 257. Hunk #8 failed at 297. Hunk #9 failed at 332. Hunk #10 succeeded at 348 with fuzz 2. Hunk #11 failed at 377. Hunk #12 failed at 419. Hunk #13 failed at 507. Hunk #14 failed at 572. Hunk #15 failed at 669. Hunk #16 failed at 722. Hunk #17 failed at 743. Hunk #18 failed at 806. Hunk #19 succeeded at 891. Hunk #20 failed at 900. Hunk #21 failed at 933. Hunk #22 succeeded at 950 with fuzz 2. Hunk #23 failed at 962. Hunk #24 failed at 985. Hunk #25 failed at 1035. Hunk #26 failed at 1050. Hunk #27 succeeded at 1148. Hunk #28 succeeded at 1173. Hunk #29 succeeded at 1217. Hunk #30 succeeded at 1234. 19 out of 30 hunks failed--saving rejects to vidcontrol.c.rej done Not being a c programmer, I can't understand what the vidcontrol.c.rej file is trying to tell me. It is a 29K file. As I recalled a previous email telling someone to go ahead anyway, I went ahead with make clean and that went ok. Then I did make all and here's the results: make all cc -O -pipe -c /usr/src/usr.sbin/vidcontrol/vidcontrol.c /usr/src/usr.sbin/vidcontrol/vidcontrol.c: In function `video_mode': /usr/src/usr.sbin/vidcontrol/vidcontrol.c:500: error: `_VESA_800x600_DFL_COLS' undeclared (first use in this function) /usr/src/usr.sbin/vidcontrol/vidcontrol.c:500: error: (Each undeclared identifier is reported only once /usr/src/usr.sbin/vidcontrol/vidcontrol.c:500: error: for each function it appears in.) /usr/src/usr.sbin/vidcontrol/vidcontrol.c:505: error: `_VESA_800x600_DFL_FNSZ' undeclared (first use in this function) /usr/src/usr.sbin/vidcontrol/vidcontrol.c:509: error: `_VESA_800x600_DFL_ROWS' undeclared (first use in this function) *** Error code 1 Stop in /usr/src/usr.sbin/vidcontrol. I did not do a make install. Guidance will be appreciated. Thanks! Jay O'Brien Rio Linda, California, USA ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Jay O'Brien pe v ne 10. 04. 2005 v 15:21 -0700: Michal Mertl wrote: There's no standard VGA 132 character text mode. It's either provided by VESA or emulated using some graphics mode. Newer graphics hardware stopped supporting extended text modes. If you want such modes you need to emulate them (render the characters using lots of small dots instead of just writing characters to the adapter which renders them for you). Support for this functionality is included in syscons/vga driver when you define options SC_PIXEL_MODE. Standard FreeBSD supports only planar graphics mode 800x600 dots with 4 bits (16) of color information per pixel which can be run on old plain VGA with 256KB of memory. The patches we are talking about add support for rendering the characters in any graphics mode your card supports (through VESA) with = 15 bits per pixel. You could then run say 1600x1200x32 bpp (16milions of colours) for a text mode console. You can't use any graphics there but the textual resolution will be bigger. There also isn't support for using simultaneously more than 16 (or is it 15?) different colors for characters even when milions are technically possible. Thanks for the explanation, it is appreciated. I tried the process and encountered errors. Here's what happened: patch /tmp/syscons.diff.20050215 this went fine. patch /tmp/vidcontrol.diff.20050215 returned errors as shown below: # patch /tmp/vidcontrol.diff.20050215 Hmm... Looks like a unified diff to me... The text leading up to this was: -- |Index: vidcontrol.1 |=== |RCS file: /home/ncvs/src/usr.sbin/vidcontrol/vidcontrol.1,v |retrieving revision 1.55 |diff -u -r1.55 vidcontrol.1 |--- vidcontrol.1 2 Mar 2003 21:04:21 - 1.55 |+++ vidcontrol.1 17 Jan 2005 05:27:25 - -- Patching file vidcontrol.1 using Plan A... Hunk #1 succeeded at 11. Hunk #2 succeeded at 88. Hunk #3 succeeded at 297. Hunk #4 succeeded at 532. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: vidcontrol.c |=== |RCS file: /home/ncvs/src/usr.sbin/vidcontrol/vidcontrol.c,v |retrieving revision 1.48 |diff -u -r1.48 vidcontrol.c |--- vidcontrol.c 13 Jan 2005 03:59:44 - 1.48 |+++ vidcontrol.c 17 Jan 2005 05:27:25 - -- Patching file vidcontrol.c using Plan A... Hunk #1 succeeded at 24. Hunk #2 succeeded at 48. Hunk #3 succeeded at 66 with fuzz 1. Hunk #4 failed at 187. Hunk #5 succeeded at 223. Hunk #6 failed at 239. Hunk #7 failed at 257. Hunk #8 failed at 297. Hunk #9 failed at 332. Hunk #10 succeeded at 348 with fuzz 2. Hunk #11 failed at 377. Hunk #12 failed at 419. Hunk #13 failed at 507. Hunk #14 failed at 572. Hunk #15 failed at 669. Hunk #16 failed at 722. Hunk #17 failed at 743. Hunk #18 failed at 806. Hunk #19 succeeded at 891. Hunk #20 failed at 900. Hunk #21 failed at 933. Hunk #22 succeeded at 950 with fuzz 2. Hunk #23 failed at 962. Hunk #24 failed at 985. Hunk #25 failed at 1035. Hunk #26 failed at 1050. Hunk #27 succeeded at 1148. Hunk #28 succeeded at 1173. Hunk #29 succeeded at 1217. Hunk #30 succeeded at 1234. 19 out of 30 hunks failed--saving rejects to vidcontrol.c.rej done Not being a c programmer, I can't understand what the vidcontrol.c.rej file is trying to tell me. It is a 29K file. As I recalled a previous email telling someone to go ahead anyway, I went ahead with make clean and that went ok. Then I did make all and here's the results: You haven't read the thread in the archives carefully enough, have you? Here is what I wrote (privately to the original poster but I explained the error to the mailing list too): What? I don't know how the patching of vidcontrol ended but you'd better redo it with fresh files from current. Go download vidcontrol.c v 1.48 and vidcontrol.1 from http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/vidcontrol/ Then run the patch on it again and recompile/reinstall vidcontrol binary. Michal ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Michal Mertl wrote: You haven't read the thread in the archives carefully enough, have you? Yes, but unfortunately I didn't comprehend. Here is what I wrote (privately to the original poster but I explained the error to the mailing list too): What? I don't know how the patching of vidcontrol ended but you'd better redo it with fresh files from current. Go download vidcontrol.c v 1.48 and vidcontrol.1 from http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/vidcontrol/ Then run the patch on it again and recompile/reinstall vidcontrol binary. I did that. The files are vidcontrol.1 Rev 1.55 and Vidcontrol.c Rev 1.48. Now all hunks failed. The results are below. What did I screw up this time? Jay |Index: vidcontrol.1 |=== |RCS file: /home/ncvs/src/usr.sbin/vidcontrol/vidcontrol.1,v |retrieving revision 1.55 |diff -u -r1.55 vidcontrol.1 |--- vidcontrol.1 2 Mar 2003 21:04:21 - 1.55 |+++ vidcontrol.1 17 Jan 2005 05:27:25 - -- Patching file vidcontrol.1 using Plan A... Hunk #1 failed at 11. Hunk #2 failed at 88. Hunk #3 failed at 297. Hunk #4 failed at 532. 4 out of 4 hunks failed--saving rejects to vidcontrol.1.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: vidcontrol.c |=== |RCS file: /home/ncvs/src/usr.sbin/vidcontrol/vidcontrol.c,v |retrieving revision 1.48 |diff -u -r1.48 vidcontrol.c |--- vidcontrol.c 13 Jan 2005 03:59:44 - 1.48 |+++ vidcontrol.c 17 Jan 2005 05:27:25 - -- Patching file vidcontrol.c using Plan A... Hunk #1 failed at 24. Hunk #2 failed at 48. Hunk #3 failed at 66. Hunk #4 failed at 187. Hunk #5 failed at 223. Hunk #6 failed at 239. Hunk #7 failed at 257. Hunk #8 failed at 297. Hunk #9 failed at 332. Hunk #10 failed at 348. Hunk #11 failed at 377. Hunk #12 failed at 419. Hunk #13 failed at 507. Hunk #14 failed at 572. Hunk #15 failed at 669. Hunk #16 failed at 722. Hunk #17 failed at 743. Hunk #18 failed at 806. Hunk #19 failed at 891. Hunk #20 failed at 900. Hunk #21 failed at 933. Hunk #22 failed at 950. Hunk #23 failed at 962. Hunk #24 failed at 985. Hunk #25 failed at 1035. Hunk #26 failed at 1050. Hunk #27 failed at 1148. Hunk #28 failed at 1173. Hunk #29 failed at 1217. Hunk #30 failed at 1234. 30 out of 30 hunks failed--saving rejects to vidcontrol.c.rej done ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Jay O'Brien wrote: Michal Mertl wrote: You haven't read the thread in the archives carefully enough, have you? Yes, but unfortunately I didn't comprehend. Here is what I wrote (privately to the original poster but I explained the error to the mailing list too): What? I don't know how the patching of vidcontrol ended but you'd better redo it with fresh files from current. Go download vidcontrol.c v 1.48 and vidcontrol.1 from http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/vidcontrol/ Then run the patch on it again and recompile/reinstall vidcontrol binary. I did that. The files are vidcontrol.1 Rev 1.55 and Vidcontrol.c Rev 1.48. Now all hunks failed. The results are below. I don't know. The text before the line starting with Patching is taken from the patch file. The patch program doesn't retrieve any files. So I think you either used bad files to patch or bad patchfile. You need to have the original files. To check they're correct you can use md5 utility. md5 vidcontrol.c MD5 (vidcontrol.c) = 1068e5a6aff863e2bc7a0c02098d43b1 md5 vidcontrol.1 MD5 (vidcontrol.1) = 080d2b84f2e3914090279fee6e5f2406 md5 vidcontrol.diff.20050215 MD5 (vidcontrol.diff.20050215) = 67ae12fe2a4fecae1bb7adb141efe021 You need to see the same strings. Then command 'patch /path/to/vidcontro.diff.20050215' must work. Michal ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
RE: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Hello, Thx for the patch, I tried it and here is my feedback. To clear out things I'm not using CURRENT, I used: a) FreeBSD5.4-prerelease (as I'm using RELENG_5), running on a HP NC6000 laptop, connected to a docking station with a Microsoft USB mouse b) I downloaded the current rc.d/moused version 1.9 and patched the file with your patch c) copied the current-patched file 1) Unfortunately the problem still exists, error messages still appear. 2) The touchpad worked but my usb mouse didn't work at all I don't have a patch that is good enough to warrant a commit at present. You may want to try the patch attached, but I can not promise that it will work for every case. Thanks for your testing! ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
RE: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Ok, sorry! I rebooted now to be sure and... the touchpad work and the usb mouse does work too! But still error messages. Didier -Original Message- From: Didier Wiroth [mailto:[EMAIL PROTECTED] Sent: Friday, April 08, 2005 11:00 To: 'Xin LI' Cc: 'freebsd-questions@freebsd.org'; 'freebsd-current@freebsd.org'; '[EMAIL PROTECTED]' Subject: RE: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT Hello, Thx for the patch, I tried it and here is my feedback. To clear out things I'm not using CURRENT, I used: a) FreeBSD5.4-prerelease (as I'm using RELENG_5), running on a HP NC6000 laptop, connected to a docking station with a Microsoft USB mouse b) I downloaded the current rc.d/moused version 1.9 and patched the file with your patch c) copied the current-patched file 1) Unfortunately the problem still exists, error messages still appear. 2) The touchpad worked but my usb mouse didn't work at all I don't have a patch that is good enough to warrant a commit at present. You may want to try the patch attached, but I can not promise that it will work for every case. Thanks for your testing! ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
RE: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Hi, Didier,
2005-04-06 13:39 +0200Didier Wiroth
Is there a patch available for the rc.d mouse script?
I don't have a patch that is good enough to warrant a commit at present.
You may want to try the patch attached, but I can not promise that it
will work for every case.
Thanks for your testing!
Cheers,
--
Xin LI delphij delphij net http://www.delphij.net/
Index: jail
===
RCS file: /home/ncvs/src/etc/rc.d/jail,v
retrieving revision 1.21
diff -u -r1.21 jail
--- jail 16 Jan 2005 03:12:03 - 1.21
+++ jail 1 Feb 2005 07:21:57 -
@@ -59,6 +59,14 @@
eval jail_procfs=\\$jail_${_j}_procfs_enable\
[ -z ${jail_procfs} ] jail_procfs=NO
+ # Default settings for skel jail
+ eval jail_skel_enable=\\$jail_${_j}_skel_enable\
+ [ -z ${jail_skel_enable} ] jail_skel_enable=NO
+ eval jail_skel_root=\\$jail_${_j}_skel_root\
+ [ -z ${jail_skel_root} ] jail_skel_root=/
+ eval jail_skel_romounts=\\$jail_${_j}_skel_romounts\
+ [ -z ${jail_skel_romounts} ] jail_skel_romounts=bin sbin lib libexec usr/bin usr/sbin usr/include usr/lib usr/libdata usr/libexec usr/sbin usr/share
+
eval jail_mount=\\$jail_${_j}_mount_enable\
[ -z ${jail_mount} ] jail_mount=NO
# /etc/fstab.${_j} will be used for {,u}mount(8) if none is specified.
@@ -81,6 +89,9 @@
debug $_j fstab: $jail_fstab
debug $_j exec start: $jail_exec_start
debug $_j exec stop: $jail_exec_stop
+ debug $_j skel enable: $jail_skel_enable
+ debug $_j skel mount-readonly: $jail_skel_romounts
+ debug $_j skel mount-readonly from: $jail_skel_root
}
# set_sysctl rc_knob mib msg
@@ -136,6 +147,14 @@
[ -f ${jail_fstab} ] || warn ${jail_fstab} does not exist
umount -a -F ${jail_fstab} /dev/null 21
fi
+ if checkyesno jail_skel_enable; then
+ for _mntpt in $jail_skel_romounts
+ do
+ if [ -d ${jail_rootdir}/${_mntpt} ] ; then
+umount -f ${jail_rootdir}/${_mntpt} /dev/null 21
+ fi
+ done
+ fi
}
jail_start()
@@ -155,6 +174,13 @@
for _jail in ${jail_list}
do
init_variables $_jail
+ if checkyesno jail_skel_enable; then
+ info Mounting skeleton for jail ${_jail} from ${jail_skel_root}
+ for _mntpt in $jail_skel_romounts
+ do
+mount_nullfs -ordonly ${jail_skel_root}/${_mntpt} ${jail_rootdir}/${_mntpt} /dev/null 21
+ done
+ fi
if checkyesno jail_mount; then
info Mounting fstab for jail ${_jail} (${jail_fstab})
if [ ! -f ${jail_fstab} ]; then
Index: moused
===
RCS file: /home/ncvs/src/etc/rc.d/moused,v
retrieving revision 1.9
diff -u -r1.9 moused
--- moused 16 Jan 2005 03:12:03 - 1.9
+++ moused 7 Apr 2005 13:41:45 -
@@ -10,10 +10,16 @@
. /etc/rc.subr
+# stdin must be redirected because it might be a serial console
+#
+ttyv=/dev/ttyv0
+
name=moused
rcvar=`set_rcvar`
command=/usr/sbin/${name}
+required_files=${ttyv}
start_cmd=moused_start
+stop_postcmd=moused_postcmd
_pidprefix=/var/run/moused
pidfile=${_pidprefix}.pid
_pidarg=
@@ -66,10 +72,13 @@
;;
esac
- for ttyv in /dev/ttyv* ; do
- vidcontrol ${ttyv} ${_mousechar_arg} -m on
- done
+ vidcontrol ${ttyv} ${_mousechar_arg} -m on
echo '.'
}
+moused_postcmd()
+{
+ vidcontrol ${ttyv} -m off
+}
+
run_rc_command $*
signature.asc
Description: This is a digitally signed message part
Re: Re : Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Hi, Michal, 2005-04-05 22:07 +0200Michal Mertl Didier Wiroth wrote: Hello, Thank you very much for replying. cd /usr/src/usr.sbin/vidcontrol patch /path/vidcontrol.diff.20050215 I'm using the RELENG_5 sources from today. The syscons.diff.20050215 works but the vidcontrol.diff.20050215 gives some errors. The diff is against the sources from -CURRENT where it applies and compiles cleanly. You should be ok using the current vidcontrol sources on -STABLE. The only difference is just some code purity fixes by Xin Li - probably in preparation for integrating the changes we speak about. I went into some problem when using the patch on my own laptop, which indicates that USB based mouse can play something nasty with the patchset :-( It does not affect the functionality seriously, but is really annoying. I would appreciate if someone can fix the issue. Cheers, -- Xin LI delphij delphij net http://www.delphij.net/ signature.asc Description: This is a digitally signed message part
RE: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Hi, I've updated the vidcontrol sources to those in the current cvs and was able to compile and install the patch on stable. High resolution console is fantastic have 1400x1050 (MODE_322) on my laptop now. I get an pfctl -sa, on one screen ... amazing :-)) It does make freebsd so much better ... I would be great to integrate these patches in future releases, please! The mouse actually works without problem in the console but I've a small mouse bug after a reboot. I assume the /etc/rc.d/mouse script needs a tiny patch. After a reboot and while launching the different services/daemon, there are about 10 lines of vidcontrol errors. Here a sample output: vidcontrol: showing the mouse: invalid argument Is there a patch available for the rc.d mouse script? Thank you Didier I believe Didier used broken vidcontrol.c file. The patch was for current and needs to be applied to clean vidcontrol.c ver 1.48. It works for me (on CURRENT anyways). Michal ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
[PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Hi, I'm using freebsd 5.4-prerelease on my laptop. My laptop has an ati mobility radeon 9600. Unfortunately it has very poor console vesa support. SC_PIXEL_MODE does not work, 90x60 is the highest resolution I can get for now. It looks like I'm not the only one having this problem with ati chipsets: http://www.freebsd.org/cgi/getmsg.cgi?fetch=1091839+1096057+/usr/local/w ww/db/text/2005/freebsd-questions/20050123.freebsd-questions I saw this posting: http://lists.freebsd.org/pipermail/freebsd-current/2004-August/035621.ht ml Unfortunately I'm not a programmer and have no ... to very poor patching skills. It looks to me, that in this posting(s) a few patches are grouped together to enable vesa 1024x768. 1) Has someone applied this patches? 2) As the patch(es) is/are on the entire page, I don't know how to separate them. Would someone mail me as an attachment the different patches and tell me how I should apply them: for example, mail me patch1, patch2, patch3 and the explanation how to patch them: cd /usr/src patch ~/patch1 patch ~/patch2 ...etc In advance, many thanks! Didier ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Didier Wiroth wrote: Hi, I'm using freebsd 5.4-prerelease on my laptop. My laptop has an ati mobility radeon 9600. Unfortunately it has very poor console vesa support. SC_PIXEL_MODE does not work, 90x60 is the highest resolution I can get for now. It looks like I'm not the only one having this problem with ati chipsets: http://www.freebsd.org/cgi/getmsg.cgi?fetch=1091839+1096057+/usr/local/w ww/db/text/2005/freebsd-questions/20050123.freebsd-questions I saw this posting: http://lists.freebsd.org/pipermail/freebsd-current/2004-August/035621.ht ml Unfortunately I'm not a programmer and have no ... to very poor patching skills. It looks to me, that in this posting(s) a few patches are grouped together to enable vesa 1024x768. 1) Has someone applied this patches? 2) As the patch(es) is/are on the entire page, I don't know how to separate them. Would someone mail me as an attachment the different patches and tell me how I should apply them: for example, mail me patch1, patch2, patch3 and the explanation how to patch them: cd /usr/src patch ~/patch1 patch ~/patch2 ...etc I think the newest and probably best (?) patch was prepared by Xin Li ([EMAIL PROTECTED]) who is also committer. I sent this email to him (or she? - sorry about that) in case he has some comments. Beware that he said he experienced some problems with previous version of the patch. I haven't tested this version of the patch myself but it at least compiles. It's available at http://people.freebsd.org/~delphij/vesa/ in files syscons.diff.20050215 and vidcontrol.diff.20050215 You would apply them with: cd /usr/src/sys/dev/syscons patch /path/syscons.diff.20050215 cd /usr/src/usr.sbin/vidcontrol patch /path/vidcontrol.diff.20050215 make clean make all make install You need also to rebuild and reinstall the kernel. You must have 'options SC_PIXEL_MODE' in your kernel config. You also need to have VESA available - you can load it with kldload vesa or include it in the kernel with 'options VESA'. After reboot with the new kernel you should be able to get list of all VESA and standard modes your card support with 'vidcontrol -i mode'. To be able to use them as your console mode you need to have the appropriate font loaded. The font resolution is seen in vidcontrol output in the 'font' column. To load the font 8x8 you can use 'vidcontrol -f /usr/share/syscons/fonts/cp437-8x8.fnt' or similar. To set the mode use 'vidcontrol MODE_$num' where $num is the mode number (first column in 'vidcontrol -i mode' output). HTH Michal ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re : Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Hello, Thank you very much for replying. cd /usr/src/usr.sbin/vidcontrol patch /path/vidcontrol.diff.20050215 I'm using the RELENG_5 sources from today. The syscons.diff.20050215 works but the vidcontrol.diff.20050215 gives some errors. |Index: vidcontrol.c |=== |RCS file: /home/ncvs/src/usr.sbin/vidcontrol/vidcontrol.c,v |retrieving revision 1.48 |diff -u -r1.48 vidcontrol.c |--- vidcontrol.c 13 Jan 2005 03:59:44 - 1.48 |+++ vidcontrol.c 17 Jan 2005 05:27:25 - -- Patching file vidcontrol.c using Plan A... Hunk #1 succeeded at 24. Hunk #2 succeeded at 48. Hunk #3 succeeded at 66 with fuzz 1. Hunk #4 failed at 187. Hunk #5 succeeded at 223. Hunk #6 failed at 239. Hunk #7 failed at 257. Hunk #8 failed at 297. Hunk #9 failed at 332. Hunk #10 succeeded at 348 with fuzz 2. Hunk #11 failed at 377. Hunk #12 failed at 419. Hunk #13 failed at 507. Hunk #14 failed at 572. Hunk #15 failed at 669. Hunk #16 failed at 722. Hunk #17 failed at 743. Hunk #18 failed at 806. Hunk #19 succeeded at 891. Hunk #20 failed at 900. Hunk #21 failed at 933. Hunk #22 succeeded at 950 with fuzz 2. Hunk #23 failed at 962. Hunk #24 failed at 985. Hunk #25 failed at 1035. Hunk #26 failed at 1050. Hunk #27 succeeded at 1148. Hunk #28 succeeded at 1173. Hunk #29 succeeded at 1217. Hunk #30 succeeded at 1234. 19 out of 30 hunks failed--saving rejects to vidcontrol.c.rej done ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Re : Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Didier Wiroth wrote: Hello, Thank you very much for replying. cd /usr/src/usr.sbin/vidcontrol patch /path/vidcontrol.diff.20050215 I'm using the RELENG_5 sources from today. The syscons.diff.20050215 works but the vidcontrol.diff.20050215 gives some errors. The diff is against the sources from -CURRENT where it applies and compiles cleanly. You should be ok using the current vidcontrol sources on -STABLE. The only difference is just some code purity fixes by Xin Li - probably in preparation for integrating the changes we speak about. Michal ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re : Re: Re : Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Unfortunately with patch applied it does not compile on stable: Warning: Object directory not changed from original /usr/src/usr.sbin/vidcontrol cc -O -pipe -c vidcontrol.c vidcontrol.c: In function `video_mode': vidcontrol.c:500: error: `_VESA_800x600_DFL_COLS' undeclared (first use in this function) vidcontrol.c:500: error: (Each undeclared identifier is reported only once vidcontrol.c:500: error: for each function it appears in.) vidcontrol.c:505: error: `_VESA_800x600_DFL_FNSZ' undeclared (first use in this function) vidcontrol.c:509: error: `_VESA_800x600_DFL_ROWS' undeclared (first use in this function) *** Error code 1 - Message d'origine - De: Michal Mertl [EMAIL PROTECTED] Date: Mardi, Avril 5, 2005 10:07 pm Objet: Re: Re : Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT Didier Wiroth wrote: Hello, Thank you very much for replying. cd /usr/src/usr.sbin/vidcontrol patch /path/vidcontrol.diff.20050215 I'm using the RELENG_5 sources from today. The syscons.diff.20050215 works but the vidcontrol.diff.20050215 gives some errors. The diff is against the sources from -CURRENT where it applies and compiles cleanly. You should be ok using the current vidcontrol sourceson -STABLE. The only difference is just some code purity fixes by Xin Li - probably in preparation for integrating the changes we speak about. Michal ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT
Didier Wiroth wrote: Unfortunately with patch applied it does not compile on stable: Warning: Object directory not changed from original /usr/src/usr.sbin/vidcontrol cc -O -pipe -c vidcontrol.c vidcontrol.c: In function `video_mode': vidcontrol.c:500: error: `_VESA_800x600_DFL_COLS' undeclared (first use in this function) vidcontrol.c:500: error: (Each undeclared identifier is reported only once vidcontrol.c:500: error: for each function it appears in.) vidcontrol.c:505: error: `_VESA_800x600_DFL_FNSZ' undeclared (first use in this function) vidcontrol.c:509: error: `_VESA_800x600_DFL_ROWS' undeclared (first use in this function) *** Error code 1 I believe Didier used broken vidcontrol.c file. The patch was for current and needs to be applied to clean vidcontrol.c ver 1.48. It works for me (on CURRENT anyways). Michal ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
