From owner-freebsd-multimedia@FreeBSD.ORG Sat Apr 23 23:07:30 2005 Return-Path: Delivered-To: freebsd-multimedia@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 02BB116A4CE for ; Sat, 23 Apr 2005 23:07:30 +0000 (GMT) Received: from mail231.csoft.net (resin.csoft.net [63.111.22.86]) by mx1.FreeBSD.org (Postfix) with SMTP id 9178543D2F for ; Sat, 23 Apr 2005 23:07:29 +0000 (GMT) (envelope-from jakemsr@jakemsr.com) Received: (qmail 8199 invoked from network); 23 Apr 2005 23:13:17 -0000 Received: from unknown (HELO puff.jakemsr.gom) (63.111.27.87) by mail231.csoft.net with SMTP; 23 Apr 2005 23:13:17 -0000 Received: (from jakemsr@jakemsr.com) by puff.jakemsr.gom (mini_sendmail/1.3.5 16nov2003); Sat, 23 Apr 2005 16:07:13 PDT (sender jakemsr@puff.jakemsr.gom) Date: Sat, 23 Apr 2005 16:07:13 -0700 From: Jacob Meuser To: freebsd-multimedia@freebsd.org Message-ID: <20050423230713.GA18463@puff.jakemsr.gom> Mail-Followup-To: freebsd-multimedia@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2i Subject: patch for bktr(4): better colorbars ioctls X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 23:07:30 -0000 see the FIXME above the current colorbar ioctl routines. -- Index: bktr_core.c =================================================================== RCS file: /home/ncvs/src/sys/dev/bktr/bktr_core.c,v retrieving revision 1.138 diff -u -r1.138 bktr_core.c --- bktr_core.c 9 Jan 2005 17:42:03 -0000 1.138 +++ bktr_core.c 23 Apr 2005 23:05:12 -0000 @@ -2200,6 +2200,23 @@ OUTB(bktr, BKTR_COLOR_CTL, INB(bktr, BKTR_COLOR_CTL) & ~(BT848_COLOR_CTL_COLOR_BARS)); break; +#ifdef BT848_SETCBARS + case BT848_SETCBARS: /* set colorbar output */ + temp = INB(bktr, BKTR_COLOR_CTL); + (*(int *)arg != 0) ? + (temp |= BT848_COLOR_CTL_COLOR_BARS) : + (temp &= ~(BT848_COLOR_CTL_COLOR_BARS)); + OUTB(bktr, BKTR_COLOR_CTL, temp); + break; +#endif + +#ifdef BT848_GETCBARS + case BT848_GETCBARS: + temp = (INB(bktr, BKTR_COLOR_CTL) & BT848_COLOR_CTL_COLOR_BARS); + *(int *)arg = (temp != 0); + break; +#endif + case BT848_GAUDIO: /* get audio channel */ temp = bktr->audio_mux_select; if ( bktr->audio_mute_state == TRUE ) Index: ioctl_bt848.h =================================================================== RCS file: /home/ncvs/src/sys/dev/bktr/ioctl_bt848.h,v retrieving revision 1.30 diff -u -r1.30 ioctl_bt848.h --- ioctl_bt848.h 20 Dec 2003 17:12:25 -0000 1.30 +++ ioctl_bt848.h 23 Apr 2005 23:05:12 -0000 @@ -124,6 +124,8 @@ #define BT848_SCBARS _IOR('x', 43, int) /* set colorbar */ #define BT848_CCBARS _IOR('x', 44, int) /* clear colorbar */ +#define BT848_SETCBARS _IOW('x', 45, int) /* set colorbar */ +#define BT848_GETCBARS _IOR('x', 45, int) /* get colorbar */ #define BT848_SAUDIO _IOW('x', 46, int) /* set audio channel */ #define BT848_GAUDIO _IOR('x', 47, int) /* get audio channel */