From owner-FreeBSD-users-jp@jp.freebsd.org  Mon Aug  6 14:40:22 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id OAA79171;
	Mon, 6 Aug 2001 14:40:22 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from rcpt-expgw.biglobe.ne.jp (rcpt-expgw.biglobe.ne.jp [210.147.6.233])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id OAA79166
	for <FreeBSD-users-jp@jp.freebsd.org>; Mon, 6 Aug 2001 14:40:21 +0900 (JST)
	(envelope-from hnakamur@mwa.biglobe.ne.jp)
Received: from smtp-gw.biglobe.ne.jp
	by rcpt-expgw.biglobe.ne.jp (8.9.3+3.2W/3.7W-01061908) with ESMTP id OAA01810
	for <FreeBSD-users-jp@jp.freebsd.org>; Mon, 6 Aug 2001 14:40:24 +0900 (JST)
X-Biglobe-Sender: <hnakamur@mwa.biglobe.ne.jp>
Received: from hiroshi.mwa.biglobe.ne.jp (211.135.234.168 [211.135.234.168]) by smtp-gw.biglobe.ne.jp
	id OAAYC0A82688; Mon, 06 Aug 2001 14:40:15 +0900 (JST)
Message-Id: <200108060541.AA00817@hiroshi.mwa.biglobe.ne.jp>
From: Hiroshi Nakamura <hnakamur@mwa.biglobe.ne.jp>
Date: Mon, 06 Aug 2001 14:41:38 +0900
To: FreeBSD-users-jp@jp.freebsd.org
In-Reply-To: <3b6dfd8e.7780%mya@guru.gr.jp>
References: <3b6dfd8e.7780%mya@guru.gr.jp>
MIME-Version: 1.0
X-Mailer: AL-Mail32 Version 1.10
Content-Type: text/plain; charset=iso-2022-jp
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+010328
X-Sequence: FreeBSD-users-jp 63450
Subject: [FreeBSD-users-jp 63450] Re: FXTV =?ISO-2022-JP?B?GyRCIVwbKEI=?=
 =?ISO-2022-JP?B?GyRCJS0lYyVXJUElYyVcITwlSRsoQg==?= GV-BCTV4/PCI
 =?ISO-2022-JP?B?GyRCJEcyO0A8JCw9UCRKJCQbKEI=?= 
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org
X-Originator: hnakamur@mwa.biglobe.ne.jp

$BCfB<$G$9!#(B

$B$*<j?t$*3]$1$7$F?=$7Lu$"$j$^$;$s!#(B

>$B$_$d$7$?$G$9!#(B
>
>*.rej $B$NCf?H$r$A$g$C$H8+$;$F$$$?$@$1$l$P;29M$K$J$j$^$9!#%9%Z!<%9(B
>$B$N07$$(B($B%?%V$H$+6uGr$,:.$6$C$F$$$k(B)$B$,860x$J$i$P(B -l $B$r$D$1$F%Q%C%A(B
>$B$rEv$FD>$;$P(B OK $B$@$H;W$$$^$9$,!"(B*.rej $B$r8+$J$$$H$J$s$H$b(B ^^;

*.rej $B$NCf?H$O!"0J2<$NMM$K$J$C$F$$$^$9!#(B

(1)bktr_audio.c.rej

***************
*** 171,177
  	 * audio source. The I/O_GV card has a more advanced multiplexer
  	 * and requires special handling.
  	 */
!         if ( bktr->bt848_card == CARD_IO_GV ) {
                  set_bctv_audio( bktr );
                  return( 0 );
  	}
--- 171,178 -----
  	 * audio source. The I/O_GV card has a more advanced multiplexer
  	 * and requires special handling.
  	 */
!         if ( (bktr->bt848_card == CARD_IO_GV) ||
! 	     (bktr->bt848_card == CARD_IO_GV4) ) {
                  set_bctv_audio( bktr );
                  return( 0 );
  	}
***************
*** 380,385 ****
  /* gpio_out_en value for read/write */
  #define BCTV_GPIO_OUT_RMASK     0x000f00
  #define BCTV_GPIO_OUT_WMASK     0x00ff00
  
  #define BCTV_BITS       100
  
--- 381,387 ----
  /* gpio_out_en value for read/write */
  #define BCTV_GPIO_OUT_RMASK     0x000f00
  #define BCTV_GPIO_OUT_WMASK     0x00ff00
+ #define BCTV_GPIO_OUT_WMASK4    0x010f00
  
  #define BCTV_BITS       100
  
***************
*** 395,401 ****
                  data = ((val << BCTV_GPIO_VAL_SHIFT) & BCTV_GPIO_VAL_MASK) |
                         ((port << BCTV_GPIO_ADDR_SHIFT) & BCTV_GPIO_ADDR_MASK) |
                         BCTV_GPIO_WE | BCTV_GPIO_OE;
!                 outbits = BCTV_GPIO_OUT_WMASK;
                  break;
          default:
                  return;
--- 397,407 ----
                  data = ((val << BCTV_GPIO_VAL_SHIFT) & BCTV_GPIO_VAL_MASK) |
                         ((port << BCTV_GPIO_ADDR_SHIFT) & BCTV_GPIO_ADDR_MASK) |
                         BCTV_GPIO_WE | BCTV_GPIO_OE;
! 		if ( bktr->bt848_card == CARD_IO_GV4 ) {
!                 	outbits = BCTV_GPIO_OUT_WMASK4;
! 		} else {
!                 	outbits = BCTV_GPIO_OUT_WMASK;
! 		}
                  break;
          default:
                  return;
-----------------------------------------------------------------------------------
(2)bktr_card.c.rej

***************
*** 342,347 ****
             { 0x20000, 0x00000, 0x30000, 0x40000, 1 }, /* audio MUX values*/
             0x70000 },                           /* GPIO mask */
  
  };
  
  struct bt848_card_sig bt848_card_signature[1]= {
--- 342,359 ----
             { 0x20000, 0x00000, 0x30000, 0x40000, 1 }, /* audio MUX values*/
             0x70000 },                           /* GPIO mask */
  
+         {  CARD_IO_GV4,                         /* the card id */
+           "I/O DATA GV-BCTV4/PCI",              /* the 'name' */
+            NULL,                                /* the tuner */
+            0,                                   /* the tuner i2c address */
+            0,                                   /* dbx is optional */
+            0,
+ 	   0,
+            0,                                   /* EEProm type */
+            0,                                   /* EEProm size */
+            { 0x10000, 0x00, 0x10000, 0x00, 1 },	/* Has special MUX handler */
+ 	   0x010f00 },				/* GPIO mask */
+ 
  };
  
  struct bt848_card_sig bt848_card_signature[1]= {
---------------------------------------------------------------------------------
(3)bktr_card.h.rej

***************
*** 76,82
  #define CARD_ASKEY_DYNALINK_MAGIC_TVIEW	14
  #define CARD_LEADTEK		15
  #define CARD_TERRATVPLUS	16
! #define Bt848_MAX_CARD		17
  
  
  int	signCard( bktr_ptr_t bktr, int offset, int count, u_char* sig );
--- 76,83 -----
  #define CARD_ASKEY_DYNALINK_MAGIC_TVIEW	14
  #define CARD_LEADTEK		15
  #define CARD_TERRATVPLUS	16
! #define CARD_IO_GV4		17
! #define Bt848_MAX_CARD		18
  
  
  int	signCard( bktr_ptr_t bktr, int offset, int count, u_char* sig );



-----------------------------------------------------------
Hiroshi Nakamura
Email:hnakamur@mwa.biglobe.ne.jp
Japanese :http://www2h.biglobe.ne.jp/~hnakamur/
English  :http://www2h.biglobe.ne.jp/~hnakamur/e/
Technolab:http://www2h.biglobe.ne.jp/~hnakamur/technolab/
---------------------------------------------------pc9821--
