Merge svn changes up to r26979

Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c

1 files changed, 69 insertions, 0 deletions

diff --git a/vidix/dhahelper/dhahelper.h b/vidix/dhahelper/dhahelper.h
new file mode 100644
index 0000000000..1ae57d26c8
--- /dev/null
+++ b/vidix/dhahelper/dhahelper.h
@@ -0,0 +1,69 @@
+/*
+    Direct Hardware Access kernel helper
+    
+    (C) 2002 Alex Beregszaszi <alex@fsn.hu>
+*/
+
+#ifndef MPLAYER_DHAHELPER_H
+#define MPLAYER_DHAHELPER_H
+
+#include <linux/ioctl.h>
+
+/* feel free to change */
+#define DEFAULT_MAJOR	180
+
+#define API_VERSION	0x1
+
+typedef struct dhahelper_port_s
+{
+#define PORT_OP_READ	1
+#define PORT_OP_WRITE	2
+    int		operation;
+    int		size;
+    int		addr;
+    int		value;
+} dhahelper_port_t;
+
+typedef struct dhahelper_memory_s
+{
+#define MEMORY_OP_MAP	1
+#define MEMORY_OP_UNMAP	2
+    int		operation;
+    int		start;
+    int		offset;
+    int		size;
+    int		ret;
+#define MEMORY_FLAG_NOCACHE 1
+    int		flags;
+} dhahelper_memory_t;
+
+typedef struct dhahelper_mtrr_s
+{
+#define MTRR_OP_ADD	1
+#define MTRR_OP_DEL	2
+    int		operation;
+    int		start;
+    int		size;
+    int		type;
+} dhahelper_mtrr_t;
+
+typedef struct dhahelper_pci_s
+{
+#define PCI_OP_READ	1
+#define PCI_OP_WRITE	1
+    int		operation;
+    int		bus;
+    int		dev;
+    int		func;
+    int		cmd;
+    int		size;
+    int		ret;
+} dhahelper_pci_t;
+
+#define DHAHELPER_GET_VERSION	_IOW('D', 0, int)
+#define DHAHELPER_PORT		_IOWR('D', 1, dhahelper_port_t)
+#define DHAHELPER_MEMORY	_IOWR('D', 2, dhahelper_memory_t)
+#define DHAHELPER_MTRR		_IOWR('D', 3, dhahelper_mtrr_t)
+#define DHAHELPER_PCI		_IOWR('D', 4, dhahelper_pci_t)
+
+#endif /* MPLAYER_DHAHELPER_H */