From owner-cvs-src@FreeBSD.ORG Wed Jun 18 02:02:47 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 72CDC37B401; Wed, 18 Jun 2003 02:02:47 -0700 (PDT) Received: from thoth.sbs.de (thoth.sbs.de [192.35.17.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2412043F3F; Wed, 18 Jun 2003 02:02:45 -0700 (PDT) (envelope-from andre.albsmeier@siemens.com) Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.11.7/8.11.7) with ESMTP id h5I92hD06946; Wed, 18 Jun 2003 11:02:43 +0200 (MEST) Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17]) by mail2.siemens.de (8.11.7/8.11.7) with ESMTP id h5I92h006831; Wed, 18 Jun 2003 11:02:43 +0200 (MEST) Received: from curry.mchp.siemens.de (curry.mchp.siemens.de [139.25.42.7]) 1.46 2003/05/28 09:28:32 ust Exp $) with ESMTP id h5I92hd4025913; Wed, 18 Jun 2003 11:02:43 +0200 (CEST) Received: (from localhost) by curry.mchp.siemens.de (8.12.9/8.12.9) id h5I92grJ066471; Date: Wed, 18 Jun 2003 11:02:42 +0200 From: Andre Albsmeier To: Max Khon Message-ID: <20030618090242.GA23697@curry.mchp.siemens.de> References: <200306171652.h5HGqmJ3050516@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="mYCpIKhGyMATD0i+" Content-Disposition: inline In-Reply-To: <200306171652.h5HGqmJ3050516@repoman.freebsd.org> X-Echelon: Harvard, 747, Satellite, SDI, AWACS X-Advice: Drop that crappy M$-Outlook, I'm tired of your viruses! User-Agent: Mutt/1.5.4i cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: Andre.Albsmeier@siemens.com cc: roger@freebsd.org Subject: Re: cvs commit: src/sys/dev/bktr bktr_core.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2003 09:02:48 -0000 --mYCpIKhGyMATD0i+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, 17-Jun-2003 at 09:52:48 -0700, Max Khon wrote: > fjoe 2003/06/17 09:52:48 PDT > > FreeBSD src repository > > Modified files: (Branch: RELENG_4) > sys/dev/bktr bktr_core.c > Log: > MFC rev 1.124: > Fix a bug which caused signals on YUV images to fail. > > MFC rev 1.125: > Fix broken programming of VSCALE_HI registers in yuv422_prog(). > > Revision Changes Path > 1.103.2.5 +9 -10 src/sys/dev/bktr/bktr_core.c > _______________________________________________ [CC'ed roger as well] Thanks for this one! However, there are also some style changes in this commit which change the ugly 1 << ... expressions into a more readable form. I would suggest to do this in the whole file -- please see the attached patch (against v 1.103.2.5) Thanks, -Andre --mYCpIKhGyMATD0i+ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="bktr_core.c.diff" --- bktr_core.c.ORI Wed Jun 18 10:53:27 2003 +++ bktr_core.c Wed Jun 18 10:56:02 2003 @@ -3198,7 +3198,7 @@ t1 = buffer; /* contruct sync : for video packet format */ - *dma_prog++ = OP_SYNC | 1 << 15 | BKTR_FM3; /*sync, mode indicator packed data*/ + *dma_prog++ = OP_SYNC | BKTR_RESYNC | BKTR_FM3; /*sync, mode indicator packed data*/ *dma_prog++ = 0; /* NULL WORD */ for (i = 0; i < (rows/interlace ) ; i++) { @@ -3212,7 +3212,7 @@ switch (i_flag) { case 1: - *dma_prog++ = OP_SYNC | 1 << 24 | BKTR_VRE; /*sync vre*/ + *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_VRE; /*sync vre*/ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; @@ -3220,7 +3220,7 @@ return; case 2: - *dma_prog++ = OP_SYNC | 1 << 24 | BKTR_VRO; /*sync vre*/ + *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_VRO; /*sync vre*/ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; @@ -3228,7 +3228,7 @@ return; case 3: - *dma_prog++ = OP_SYNC | 1 << 24 | 1 << 15 | BKTR_VRO; + *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRO; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; @@ -3242,7 +3242,7 @@ target_buffer = (u_long) buffer + cols; t1 = buffer + cols/2; - *dma_prog++ = OP_SYNC | 1 << 15 | BKTR_FM3; + *dma_prog++ = OP_SYNC | BKTR_RESYNC | BKTR_FM3; *dma_prog++ = 0; /* NULL WORD */ for (i = 0; i < (rows/interlace ) ; i++) { @@ -3255,7 +3255,7 @@ } } - *dma_prog++ = OP_SYNC | 1 << 24 | 1 << 15 | BKTR_VRE; + *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRE; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; *dma_prog++ = (u_long ) vtophys(bktr->dma_prog) ; @@ -3297,7 +3297,7 @@ buffer = target_buffer; t1 = buffer; - *dma_prog++ = OP_SYNC | 1 << 15 | BKTR_FM3; /*sync, mode indicator packed data*/ + *dma_prog++ = OP_SYNC | BKTR_RESYNC | BKTR_FM3; /*sync, mode indicator packed data*/ *dma_prog++ = 0; /* NULL WORD */ for (i = 0; i < (rows/interlace )/2 ; i++) { @@ -3316,7 +3316,7 @@ switch (i_flag) { case 1: - *dma_prog++ = OP_SYNC | 1 << 24 | BKTR_VRE; /*sync vre*/ + *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_VRE; /*sync vre*/ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; @@ -3324,7 +3324,7 @@ return; case 2: - *dma_prog++ = OP_SYNC | 1 << 24 | BKTR_VRO; /*sync vro*/ + *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_VRO; /*sync vro*/ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; @@ -3332,7 +3332,7 @@ return; case 3: - *dma_prog++ = OP_SYNC | 1 << 24 | 1 << 15 | BKTR_VRO; + *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRO; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; *dma_prog = (u_long ) vtophys(bktr->odd_dma_prog); @@ -3345,7 +3345,7 @@ target_buffer = (u_long) buffer + cols; t1 = buffer + cols/2; - *dma_prog++ = OP_SYNC | 1 << 15 | BKTR_FM3; + *dma_prog++ = OP_SYNC | BKTR_RESYNC | BKTR_FM3; *dma_prog++ = 0; /* NULL WORD */ for (i = 0; i < ((rows/interlace )/2 ) ; i++) { @@ -3365,7 +3365,7 @@ } - *dma_prog++ = OP_SYNC | 1 << 24 | 1 << 15 | BKTR_VRE; + *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRE; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); --mYCpIKhGyMATD0i+--