*** empty log message ***

diff --git a/audiomvp.h b/audiomvp.h
index 52c3b53589291db2632c257ac1a889ec6983dce9..40694ab88fc2134286e486000d7b0068623c083d 100644 (file)
--- a/audiomvp.h
+++ b/audiomvp.h
@@ -30,9 +30,42 @@
 
 #include "defines.h"
 #include "log.h"
-#include "stb.h"
 #include "audio.h"
 
+
+typedef struct
+{
+  int parm1;
+  int parm2;
+} aud_sync_parms_t;
+
+typedef struct
+{
+  int aud_ctl0;
+  int aud_ctl1;
+  int aud_ctl2;
+} aud_ctl_regs_t;
+
+#define AV_SET_AUD_PLAY         _IOW('a', 2, int)
+#define AV_SET_AUD_PAUSE        _IOW('a', 3, int)
+#define AV_SET_AUD_UNPAUSE      _IOW('a', 4, int)
+#define AV_SET_AUD_SRC          _IOW('a', 5, int)
+#define AV_SET_AUD_MUTE         _IOW('a', 6, int)
+#define AV_SET_AUD_CHANNEL      _IOW('a', 9, int)
+#define AV_GET_AUD_INFO         _IOR('a', 10, int)
+#define AV_SET_AUD_VOLUME       _IOW('a', 13, int)
+#define AV_GET_AUD_VOLUME       _IOR('a', 14, int)
+#define AV_SET_AUD_STREAMTYPE   _IOW('a', 15, int)
+#define AV_SET_AUD_FORMAT       _IOW('a', 16, int)
+#define AV_GET_AUD_TIMESTAMPS   _IOR('a', 21, sync_data_t*)
+#define AV_SET_AUD_STC          _IOW('a', 22, uint64_t *)
+#define AV_SET_AUD_SYNC         _IOW('a', 23, int)
+#define AV_SET_AUD_DISABLE_SYNC _IOW('a', 24, aud_sync_parms_t*)
+#define AV_SET_AUD_RESET        _IOW('a', 26, int)
+#define AV_SET_AUD_DAC_CLK      _IOW('a', 27, int)
+#define AV_GET_AUD_REGS         _IOW('a', 28, aud_ctl_regs_t*)
+
+
 class AudioMVP : public Audio
 {
   public:

diff --git a/ledmvp.h b/ledmvp.h
index a59400f8be2ceaca16f34777669e8c394a8126e3..ed169e753b8956e9648dbf9c6b7482237271a569 100644 (file)
--- a/ledmvp.h
+++ b/ledmvp.h
@@ -25,7 +25,8 @@
 #include <sys/ioctl.h>
 
 #include "led.h"
-#include "stb.h"
+
+#define IR_SET_LED    _IOW('i',21,int)
 
 class LedMVP : public Led
 {

diff --git a/stb.h b/stb.h
deleted file mode 100644 (file)
index ef828f4..0000000
--- a/stb.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-
-    This file is modified by Chris Tallon from the original stb.h
-    in libav, from the mvpmc project. libav is licensed under the
-    Lesser General Public License.
-
-    As per point 3 of the Lesser General Public License, I am
-    applying the General Public License to my copy of the library
-    and therefore to this file. The copyright notice below has been
-    changed accordingly.
-
-*/
-
-/*
-    Copyright (C) 2004, BtB, Jon Gettler
-    http://mvpmc.sourceforge.net/
-
-    This file is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This file is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with This file; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- */
-
-
-#ifndef STB_H
-#define STB_H
-
-/*
- * $Id$
- *
- * This describes the IBM STBx25xx/STBx30xxx hardware interface.
- *
- * Jon Gettler <gettler@acm.org>
- */
-
-#include <stdint.h>
-
-typedef struct {
-  int arg;
-  int a;
-  int b;
-  int c;
-  int d;
-  int e;
-  int f;
-} set_display_t;
-
-
-
-typedef struct {
-  unsigned long handle1;
-  unsigned long x;
-  unsigned long y;
-  unsigned long w;
-  unsigned long h;
-  unsigned long handle2;
-  unsigned long x1;
-  unsigned long y1;
-  unsigned long w1;
-  unsigned long h1;
-  unsigned long colour1;
-} osd_blend_t;
-
-typedef struct {
-  unsigned long handle;
-  unsigned long x;
-  unsigned long y;
-  unsigned long w;
-  unsigned long h;
-  unsigned long colour1;
-  unsigned long colour2;
-  unsigned long colour3;
-  unsigned long colour4;
-  unsigned long colour5;
-  unsigned long colour6;
-  unsigned long colour7;
-  unsigned char c[2];
-} osd_afillblt_t;
-
-typedef struct {
-  unsigned long handle;
-  unsigned long left;
-  unsigned long top;
-  unsigned long right;
-  unsigned long bottom;
-} osd_clip_rec_t;
-
-/* OLD
-typedef struct {
-  int w;
-  int h;
-  int scale;
-  int x1;
-  int y;
-  int x;
-  int y2;
-  int x3;
-  int y3;
-  int x4;
-  int y4;
-} vid_pos_regs_t;
-*/
-
-// NEW
-typedef struct {
-  int y;
-  int x;
-  int w;
-  int h;
-} vid_rect_t;
-
-typedef struct {
-  vid_rect_t src;
-  vid_rect_t dest;
-} vid_pos_regs_t;
-//
-
-/*
-typedef struct {
-  int stc_b32;
-  int stc_b0;
-  int pts_b32;
-  int pts_b0;
-} pts_sync_data_t;
-*/
-
-typedef struct {
-  int parm1;
-  int parm2;
-} aud_sync_parms_t;
-
-typedef struct {
-  int aud_ctl0;
-  int aud_ctl1;
-  int aud_ctl2;
-} aud_ctl_regs_t;
-
-typedef struct {
-  int denc0_cr1;
-  int denc1_cr1;
-  int dencmux;
-  int vid_disp_mode;
-} vid_ctl_regs_t;
-
-struct vid_regs {
-  unsigned char dummy[44];
-};
-
-typedef struct {
-  int nleft;
-  int state;
-} vid_state_regs_t;
-
-typedef struct {
-  uint64_t stc;
-  uint64_t pts;
-} sync_data_t;
-
-
-/*
- * /dev/adec_mpeg
- */
-#define AV_SET_AUD_PLAY   _IOW('a',2,int)
-#define AV_SET_AUD_PAUSE  _IOW('a',3,int)
-#define AV_SET_AUD_UNPAUSE  _IOW('a',4,int)
-#define AV_SET_AUD_SRC    _IOW('a',5,int)
-#define AV_SET_AUD_MUTE   _IOW('a',6,int)
-#define AV_SET_AUD_CHANNEL  _IOW('a',9,int)
-#define AV_GET_AUD_INFO   _IOR('a',10,int)
-#define AV_SET_AUD_VOLUME _IOW('a',13,int)
-#define AV_GET_AUD_VOLUME _IOR('a',14,int)
-#define AV_SET_AUD_STREAMTYPE _IOW('a',15,int)
-#define AV_SET_AUD_FORMAT _IOW('a',16,int)
-#define AV_GET_AUD_TIMESTAMPS  _IOR('a',21, sync_data_t*)
-#define AV_SET_AUD_STC    _IOW('a',22,uint64_t *)
-#define AV_SET_AUD_SYNC   _IOW('a',23,int)
-#define AV_SET_AUD_DISABLE_SYNC _IOW('a',24,aud_sync_parms_t*)
-#define AV_SET_AUD_RESET  _IOW('a',26,int)
-#define AV_SET_AUD_DAC_CLK  _IOW('a',27,int)
-#define AV_GET_AUD_REGS   _IOW('a',28,aud_ctl_regs_t*)
-
-/*
- * /dev/vdec_dev
- */
-
-// CJT
-#define AV_SET_VID_STOP    _IOW('v', 21, int)
-
-
-#define AV_SET_VID_PLAY   _IOW('v',22,int)
-#define AV_SET_VID_FREEZE _IOW('v',23,int)
-#define AV_SET_VID_RESUME _IOW('v',24,int)
-#define AV_SET_VID_SRC    _IOW('v',25,int)
-#define AV_SET_VID_FB   _IOW('v',26,int)
-#define AV_GET_VID_STATE  _IOR('v',27,vid_state_regs_t*)
-#define AV_SET_VID_PAUSE  _IOW('v',28,int)
-#define AV_SET_VID_FFWD   _IOW('v',29,int)
-#define AV_SET_VID_SLOMO  _IOW('v',30,int)
-#define AV_SET_VID_BLANK  _IOW('v',32,int)
-#define AV_SET_VID_POSITION _IOW('v',36,vid_pos_regs_t*)
-#define AV_SET_VID_SCALE_ON _IOW('v',37,int)
-#define AV_SET_VID_SCALE_OFF  _IOW('v',38,int)
-#define AV_GET_VID_TIMESTAMPS   _IOR('v',39, sync_data_t*)
-#define AV_SET_VID_STC    _IOW('v',40,uint64_t *)
-#define AV_SET_VID_RATIO  _IOW('v',41,int)
-#define AV_SET_VID_SYNC   _IOW('v',42,int)
-#define AV_SET_VID_DISABLE_SYNC _IOW('v',43,int)
-#define AV_SET_VID_DISP_FMT _IOW('v',45,int)
-#define AV_SET_VID_RESET  _IOW('v',51,int)
-#define AV_SET_VID_OUTPUT _IOW('v',57,int)
-#define AV_SET_VID_MODE   _IOW('v',58,int)
-#define AV_GET_VID_REGS   _IOR('v',61,struct vid_regs*)
-#define AV_SET_VID_COLORBAR _IOW('v',62,int)
-#define AV_SET_VID_DENC   _IOW('v',63,int)
-#define AV_CHK_SCART    _IOW('v',64,int)
-
-/*
- * screen device
- */
-#define AV_GET_VID_INFO   _IOR('s',44,int)
-
-/*
- * /dev/rawir
- */
-#define IR_SET_LED    _IOW('i',21,int)
-
-
-#endif /* STB_H */

diff --git a/videomvp.h b/videomvp.h
index bbcdb49c8c988317a5cc758fba891cc7f9da60c4..b0125caf3490471e4802d8ae313da9f0aba1e7e8 100644 (file)
--- a/videomvp.h
+++ b/videomvp.h
@@ -32,9 +32,69 @@
 #include <sys/ioctl.h>
 #include <string.h>
 
+#include <stdint.h>
+
 #include "defines.h"
 #include "video.h"
-#include "stb.h"
+
+typedef struct
+{
+  int nleft;
+  int state;
+} vid_state_regs_t;
+
+typedef struct
+{
+  uint64_t stc;
+  uint64_t pts;
+} sync_data_t;
+
+typedef struct
+{
+  int y;
+  int x;
+  int w;
+  int h;
+} vid_rect_t;
+
+typedef struct
+{
+  vid_rect_t src;
+  vid_rect_t dest;
+} vid_pos_regs_t;
+
+struct vid_regs
+{
+  UCHAR dummy[44];
+};
+
+#define AV_SET_VID_STOP         _IOW('v', 21, int)
+#define AV_SET_VID_PLAY         _IOW('v', 22, int)
+#define AV_SET_VID_FREEZE       _IOW('v', 23, int)
+#define AV_SET_VID_RESUME       _IOW('v', 24, int)
+#define AV_SET_VID_SRC          _IOW('v', 25, int)
+#define AV_SET_VID_FB           _IOW('v', 26, int)
+#define AV_GET_VID_STATE        _IOR('v', 27, vid_state_regs_t*)
+#define AV_SET_VID_PAUSE        _IOW('v', 28, int)
+#define AV_SET_VID_FFWD         _IOW('v', 29, int)
+#define AV_SET_VID_SLOMO        _IOW('v', 30, int)
+#define AV_SET_VID_BLANK        _IOW('v', 32, int)
+#define AV_SET_VID_POSITION     _IOW('v', 36, vid_pos_regs_t*)
+#define AV_SET_VID_SCALE_ON     _IOW('v', 37, int)
+#define AV_SET_VID_SCALE_OFF    _IOW('v', 38, int)
+#define AV_GET_VID_TIMESTAMPS   _IOR('v', 39, sync_data_t*)
+#define AV_SET_VID_STC          _IOW('v', 40, uint64_t*)
+#define AV_SET_VID_RATIO        _IOW('v', 41, int)
+#define AV_SET_VID_SYNC         _IOW('v', 42, int)
+#define AV_SET_VID_DISABLE_SYNC _IOW('v', 43, int)
+#define AV_SET_VID_DISP_FMT     _IOW('v', 45, int)
+#define AV_SET_VID_RESET        _IOW('v', 51, int)
+#define AV_SET_VID_OUTPUT       _IOW('v', 57, int)
+#define AV_SET_VID_MODE         _IOW('v', 58, int)
+#define AV_GET_VID_REGS         _IOR('v', 61, struct vid_regs*)
+#define AV_SET_VID_COLORBAR     _IOW('v', 62, int)
+#define AV_SET_VID_DENC         _IOW('v', 63, int)
+#define AV_CHK_SCART            _IOW('v', 64, int)
 
 #define WRITE_LENGTH (32*1024) // Consume up to 32K at a time from Stream
 #define WRITE_PACKETS 16       // But no more than 16 packets