Corrected ioctl numbers conflict.

Thanks to Vsevolod Lobko <seva@alex-ua.com> for spotting this.
P:

1 files changed, 47 insertions, 37 deletions

diff --git a/sys/dev/bktr/ioctl_bt848.h b/sys/dev/bktr/ioctl_bt848.h
index ec08cb9..9cddd33 100644
--- a/sys/dev/bktr/ioctl_bt848.h
+++ b/sys/dev/bktr/ioctl_bt848.h
@@ -1,7 +1,7 @@
 /*
  * extensions to ioctl_meteor.h for the bt848 cards
  *
- * $Id: ioctl_bt848.h,v 1.20 1999/01/28 16:32:52 roger Exp $
+ * $Id: ioctl_bt848.h,v 1.19 1998/09/30 21:06:55 sos Exp $
  */
 
 /*
@@ -136,30 +136,25 @@ struct eeProm {
 #define BT848_SLNOTCH	_IOW('x', 55, int)		/* set luma notch */
 #define BT848_GLNOTCH	_IOR('x', 56, int)		/* get luma notch */
 
-#define BT848_MAX_CHNLSET_NAME_LEN 16
-struct bktr_chnlset {
-       short   index;
-       short   max_channel;
-       char    name[BT848_MAX_CHNLSET_NAME_LEN];
-};
-
-#define	TVTUNER_GETCHNLSET _IOWR('x', 57, struct bktr_chnlset) /* get channelset */
-
-struct bktr_remote {
-       unsigned char data[3];
-};
-#define	REMOTE_GETKEY _IOR('x', 58, struct bktr_remote) /*get remote keypress*/                                                         /*returns raw data*/
+/* Read/Write the BT848's I2C bus directly
+ * b7-b0:    data (read/write)
+ * b15-b8:   internal peripheral register (write)   
+ * b23-b16:  i2c addr (write)
+ * b31-b24:  1 = write, 0 = read 
+ */
+#define BT848_I2CWR     _IOWR('x', 57, u_long)    /* i2c read-write */
 
+/* Support for radio tuner */
+#define RADIO_SETMODE	 _IOW('x', 58, unsigned int)  /* set radio modes */
+#define RADIO_GETMODE	 _IOR('x', 58, unsigned char)  /* get radio modes */
+#define   RADIO_AFC	 0x01		/* These modes will probably not */
+#define   RADIO_MONO	 0x02		/*  work on the FRxxxx. It does	 */
+#define   RADIO_MUTE	 0x08		/*  work on the FMxxxx.	*/
+#define RADIO_SETFREQ    _IOW('x', 59, unsigned int)  /* set frequency   */
+#define RADIO_GETFREQ    _IOR('x', 59, unsigned int)  /* set frequency   */
+ /*        Argument is frequency*100MHz  */
 
 /*
- * Direct access to GPIO pins
- */
-#define BT848_GPIO_SET_EN      _IOW('x', 59, int)      /* set gpio_out_en */
-#define BT848_GPIO_GET_EN      _IOR('x', 60, int)      /* get gpio_out_en */
-#define BT848_GPIO_SET_DATA    _IOW('x', 61, int)      /* set gpio_data */
-#define BT848_GPIO_GET_DATA    _IOR('x', 62, int)      /* get gpio_data */
- 
-/*
  * XXX: more bad magic,
  *      we need to fix the METEORGINPUT to return something public
  *      duplicate them here for now...
@@ -240,22 +235,37 @@ struct bktr_capture_area {
 #define BT848_SCAPAREA   _IOW('x', 69, struct bktr_capture_area)
 #define BT848_GCAPAREA   _IOR('x', 69, struct bktr_capture_area)
 
-/* Read/Write the BT848's I2C bus directly
- * b7-b0:    data (read/write)
- * b15-b8:   internal peripheral register (write)   
- * b23-b16:  i2c addr (write)
- * b31-b24:  1 = write, 0 = read 
+
+/* Get channel Set */
+#define BT848_MAX_CHNLSET_NAME_LEN 16
+struct bktr_chnlset {
+       short   index;
+       short   max_channel;
+       char    name[BT848_MAX_CHNLSET_NAME_LEN];
+};
+#define	TVTUNER_GETCHNLSET _IOWR('x', 70, struct bktr_chnlset)
+
+
+
+/* Infra Red Remote Control */
+struct bktr_remote {
+       unsigned char data[3];
+};
+#define	REMOTE_GETKEY      _IOR('x', 71, struct bktr_remote)/*read the remote */
+                                                            /*control receiver*/
+                                                            /*returns raw data*/
+
+ 
+/*
+ * Direct access to GPIO pins. You must add BKTR_GPIO_ACCESS to your kernel
+ * configuration file to use these 
  */
-#define BT848_I2CWR     _IOWR('x', 57, u_long)    /* i2c read-write */
-/* Support for radio tuner */
-#define RADIO_SETMODE	 _IOW('x', 58, unsigned int)  /* set radio modes */
-#define RADIO_GETMODE	 _IOR('x', 58, unsigned char)  /* get radio modes */
-#define   RADIO_AFC	 0x01		/* These modes will probably not */
-#define   RADIO_MONO	 0x02		/*  work on the FRxxxx. It does	 */
-#define   RADIO_MUTE	 0x08		/*  work on the FMxxxx.	*/
-#define RADIO_SETFREQ    _IOW('x', 59, unsigned int)  /* set frequency   */
-#define RADIO_GETFREQ    _IOR('x', 59, unsigned int)  /* set frequency   */
- /*        Argument is frequency*100MHz  */
+#define BT848_GPIO_SET_EN      _IOW('x', 72, int)      /* set gpio_out_en */
+#define BT848_GPIO_GET_EN      _IOR('x', 73, int)      /* get gpio_out_en */
+#define BT848_GPIO_SET_DATA    _IOW('x', 74, int)      /* set gpio_data */
+#define BT848_GPIO_GET_DATA    _IOR('x', 75, int)      /* get gpio_data */
+
+
 
 /*  XXX - Copied from /sys/pci/brktree_reg.h  */
 #define BT848_IFORM_FORMAT              (0x7<<0)