From owner-freebsd-questions@FreeBSD.ORG Mon Apr 11 07:51:00 2005 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9465B16A4CE for ; Mon, 11 Apr 2005 07:51:00 +0000 (GMT) Received: from mtiwmhc12.worldnet.att.net (mtiwmhc12.worldnet.att.net [204.127.131.116]) by mx1.FreeBSD.org (Postfix) with ESMTP id C63E543D2F for ; Mon, 11 Apr 2005 07:50:59 +0000 (GMT) (envelope-from jayobrien@att.net) Received: from [192.168.1.6] (dsl093-180-184.sac1.dsl.speakeasy.net[66.93.180.184]) by worldnet.att.net (mtiwmhc12) with ESMTP id <2005041107510411200m99kee>; Mon, 11 Apr 2005 07:51:05 +0000 Message-ID: <425A2C5F.4070604@att.net> Date: Mon, 11 Apr 2005 00:50:55 -0700 From: Jay O'Brien User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.2) Gecko/20040803 X-Accept-Language: en-us, en MIME-Version: 1.0 To: FreeBSD - questions References: <0IEH00KMJ6U14XA0@store.etat.lu> <1112729834.68302.2.camel@genius2.i.cz> <4258D61C.90301@att.net> <1113127599.8293.116.camel@genius2.i.cz> <42594C93.5070203@att.net> <1113149943.630.37.camel@genius2.i.cz> <4259A6E9.2090104@att.net> <1113173019.630.45.camel@genius2.i.cz> <4259B932.1010005@att.net> <1113177108.630.56.camel@genius2.i.cz> In-Reply-To: <1113177108.630.56.camel@genius2.i.cz> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Subject: Re: [PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Apr 2005 07:51:00 -0000 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