From 7c20a4dd2907fe24ba1967344e95eb1e2948d358 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 28 May 2006 13:24:45 +0000 Subject: gpe-calendar: add libsoup to the DEPENDS field of the cvs version --- packages/gpe-calendar/gpe-calendar_cvs.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/gpe-calendar/gpe-calendar_cvs.bb b/packages/gpe-calendar/gpe-calendar_cvs.bb index a891431ffb..06252e67bd 100644 --- a/packages/gpe-calendar/gpe-calendar_cvs.bb +++ b/packages/gpe-calendar/gpe-calendar_cvs.bb @@ -5,11 +5,12 @@ S = "${WORKDIR}/${PN}" PV = "0.72+cvs${SRCDATE}" PR = "r1" +PARALLEL_MAKE = "" inherit autotools gpe SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" -DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" +DEPENDS = "libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" SECTION = "gpe" RDEPENDS = "gpe-icons" DESCRIPTION = "GPE calendar" -- cgit v1.2.3 From db176af0bf1987aac2502954576d9265a92b80fe Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 28 May 2006 16:56:51 +0000 Subject: keylaunch: Akita / Spitz: Update keymapping to allow switching to the VT from inside X with Fn+Left or Fn+Right. Also includes a new script to make chvt SUID root to allow users to switch VTs --- packages/keylaunch/files/80chvt-SUID | 25 +++++++++++++++++++++++++ packages/keylaunch/files/akita/keylaunchrc | 4 ++++ packages/keylaunch/files/spitz/keylaunchrc | 4 ++++ packages/keylaunch/keylaunch_2.0.10.bb | 2 +- 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 packages/keylaunch/files/80chvt-SUID diff --git a/packages/keylaunch/files/80chvt-SUID b/packages/keylaunch/files/80chvt-SUID new file mode 100644 index 0000000000..e3b4efef5d --- /dev/null +++ b/packages/keylaunch/files/80chvt-SUID @@ -0,0 +1,25 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: chvt-SUID.sh +# Date: 28-May-06 + + +# +# Sets the SUID bit on chvt to allow changing to the VT from inside X by +# any user. Since a SUID binary still is a security risk, we chmod only +# when keylaunch is used and not by default. +# + +for target in /usr/bin/chvt.console-tools +do + if test "`ls -l "$target" | awk '{print $1}'|cut -c 2-4`" != "rws" + then + echo "Making [$target] SUID root..." + chmod u+s "$target" + else + echo "Ignoring [$target]" + fi +done diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc index 0379c719c4..27cce24e93 100644 --- a/packages/keylaunch/files/akita/keylaunchrc +++ b/packages/keylaunch/files/akita/keylaunchrc @@ -22,3 +22,7 @@ key=....F18:-:gpe-calendar #key=....F19:-: #key=....F19:-: #key=....F10:-: + +# VT changing +key=...*Left:-:~chvt 1 +key=...*Right:-:~chvt 3 diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc index f5e1fd70be..433221a586 100644 --- a/packages/keylaunch/files/spitz/keylaunchrc +++ b/packages/keylaunch/files/spitz/keylaunchrc @@ -22,3 +22,7 @@ key=....F18:-:gpe-calendar #key=....F19:-: #key=....F19:-: #key=....F10:-: + +# VT changing +key=...*Left:-:~chvt 1 +key=...*Right:-:~chvt 3 diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb index c06c9c4587..67ed0923f2 100644 --- a/packages/keylaunch/keylaunch_2.0.10.bb +++ b/packages/keylaunch/keylaunch_2.0.10.bb @@ -13,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\ program is already running, keylaunch can bring its window to the front\ rather than just running another copy." PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r4" +PR = "r5" SRC_URI += " file://keylaunchrc" -- cgit v1.2.3 From 3694ac79fed760ce35b6613473281bb3b5e7ddc1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 28 May 2006 18:41:37 +0000 Subject: bluez-utils: apply 0x0,0x0 -> bcps patch for all distributions --- packages/bluez/bluez-utils.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index db5ddf066d..e71f2cef87 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -15,9 +15,8 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://02dtl1_cs.sh" # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol -# Let's default to that instead of 'any' and see if we break something with that -SRC_URI_append_familiar = " file://default-manfid-0x0-to-bcps.patch;patch=1" -SRC_URI_append_openzaurus = " file://default-manfid-0x0-to-bcps.patch;patch=1" +# Let's default to that instead of 'any' until further notice... +SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" S = "${WORKDIR}/bluez-utils-${PV}" -- cgit v1.2.3 From f18661145bcacd7adca80e31cf3ee214f3ad7078 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 28 May 2006 18:49:08 +0000 Subject: multimachine: Change from an include to a .bblass (and update distros using multimachine accordingly). Add code to find packages with machine specific subpackages and build these in a multimachine compatible way. --- classes/multimachine.bbclass | 22 ++++++++++++++++++++++ conf/distro/angstrom.conf | 4 +--- conf/distro/familiar.conf | 4 +--- conf/distro/include/.mtn2git_empty | 0 conf/distro/include/multimachine.conf | 3 --- conf/distro/jlime-donkey.conf | 12 +++++------- conf/distro/openzaurus.conf | 4 +--- 7 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 classes/multimachine.bbclass delete mode 100644 conf/distro/include/.mtn2git_empty delete mode 100644 conf/distro/include/multimachine.conf diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass new file mode 100644 index 0000000000..2248f326cc --- /dev/null +++ b/classes/multimachine.bbclass @@ -0,0 +1,22 @@ +STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}-${HOST_OS}/${PF}" +WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}-${HOST_OS}/${PF}" +STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}-${HOST_OS}/kernel" + +# Find any machine specific sub packages and if present, mark the +# whole package as machine specific for multimachine purposes. +python __anonymous () { + packages = bb.data.getVar('PACKAGES', d, 1).split() + macharch = bb.data.getVar('MACHINE_ARCH', d, 1) + multiarch = bb.data.getVar('PACKAGE_ARCH', d, 1) + + for pkg in packages: + pkgarch = bb.data.getVar("PACKAGE_ARCH_%s" % pkg, d, 1) + + # We could look for != PACKAGE_ARCH here but how to choose + # if multiple differences are present? + # Look through IPKG_ARCHS for the priority order? + if pkgarch and pkgarch == macharch: + multiarch = macharch + + bb.data.setVar('MULTIMACH_ARCH', multiarch, d) +} diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf index 403b13934f..100017410d 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/angstrom.conf @@ -12,10 +12,8 @@ ANGSTROM_URI = "http://www.angstrom-distribution.org/" MAINTAINER = "Angstrom Developers " #use ipkg package format with debian style naming -INHERIT += "package_ipk debian" - #use multimachine buildrules -include conf/distro/include/multimachine.conf +INHERIT += "package_ipk debian multimachine" #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native" diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf index da5caa7998..2646fe78a6 100644 --- a/conf/distro/familiar.conf +++ b/conf/distro/familiar.conf @@ -4,7 +4,7 @@ MAINTAINER ?= "Familiar Developers " -INHERIT += "package_ipk debian" +INHERIT += "package_ipk debian multimachine" TARGET_OS = "linux" BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" @@ -15,5 +15,3 @@ PARALLEL_INSTALL_MODULES = "1" UDEV_DEVFS_RULES = "1" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" - -include conf/distro/include/multimachine.conf diff --git a/conf/distro/include/.mtn2git_empty b/conf/distro/include/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/conf/distro/include/multimachine.conf b/conf/distro/include/multimachine.conf deleted file mode 100644 index 1f73ffd30f..0000000000 --- a/conf/distro/include/multimachine.conf +++ /dev/null @@ -1,3 +0,0 @@ -STAMP = "${TMPDIR}/stamps/${PACKAGE_ARCH}-${HOST_OS}/${PF}" -WORKDIR = "${TMPDIR}/work/${PACKAGE_ARCH}-${HOST_OS}/${PF}" -STAGING_KERNEL_DIR = "${STAGING_DIR}/${PACKAGE_ARCH}-${HOST_OS}/kernel" diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 01c90a5b26..dfdbe19e46 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -53,7 +53,11 @@ PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312" #<> #<>Other Specific stuff. #<> -INHERIT += "package_tar package_ipk" +#<> +#<>We want to be able to build this for all jornadas so +#<>to not mess up the folders we need to make them dynamic. +#<>It will use different folders depending on Arch (set in local.conf) +INHERIT += "package_tar package_ipk multimachine" BBINCLUDELOGS = "yes" IMAGE_FSTYPES = "tar.bz2" TARGET_OS = "linux" @@ -75,12 +79,6 @@ include conf/distro/preferred-opie-versions.inc #<> PCMCIA_MANAGER = "pcmciautils" -#<> -#<>We want to be able to build this for all jornadas so -#<>to not mess up the folders we need to make them dynamic. -#<>It will use different folders depending on Arch (set in local.conf) -include conf/distro/include/multimachine.conf - #<> #<> Dont wanna break stuff when "some" packages do -O3, so lets set it at -O2 #<> diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf index edcbacc80e..b7f456320f 100644 --- a/conf/distro/openzaurus.conf +++ b/conf/distro/openzaurus.conf @@ -5,7 +5,7 @@ DISTRO = "openzaurus" DISTRO_NAME = "OpenZaurus" -INHERIT += " package_ipk debian" +INHERIT += " package_ipk debian multimachine" # For some reason, this doesn't work # TARGET_OS ?= "linux" TARGET_OS = "linux" @@ -16,5 +16,3 @@ BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version" PARALLEL_INSTALL_MODULES = "1" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" - -include conf/distro/include/multimachine.conf -- cgit v1.2.3 From 6369db1f59866e6bc33e0574a715b5d22fab698f Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 28 May 2006 18:52:51 +0000 Subject: gpe-login: Enable switching to the VT with Fn+[Left|Right]Arrow and killing X with Fn+Esc --- packages/gpe-login/files/chvt-keylaunch.patch | 11 +++++++++++ packages/gpe-login/gpe-login_0.86.bb | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 packages/gpe-login/files/chvt-keylaunch.patch diff --git a/packages/gpe-login/files/chvt-keylaunch.patch b/packages/gpe-login/files/chvt-keylaunch.patch new file mode 100644 index 0000000000..5e62a1107e --- /dev/null +++ b/packages/gpe-login/files/chvt-keylaunch.patch @@ -0,0 +1,11 @@ +--- gpe-login-0.86/gpe-login.keylaunchrc.orig 2006-05-28 20:38:39.846547024 +0200 ++++ gpe-login-0.86/gpe-login.keylaunchrc 2006-05-28 20:38:56.800969560 +0200 +@@ -1,3 +1,8 @@ + key=???XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh + key=???XF86PowerDown:-:/usr/bin/apm --suspend + key=???Held XF86PowerDown:-:bl toggle ++ ++# VT changing ++key=...*Left:-:~chvt 1 ++key=...*Right:-:~chvt 3 ++key=...*Escape:-:~/etc/init.d/gpe-dm stop diff --git a/packages/gpe-login/gpe-login_0.86.bb b/packages/gpe-login/gpe-login_0.86.bb index f6eb0c921a..1dd6818903 100644 --- a/packages/gpe-login/gpe-login_0.86.bb +++ b/packages/gpe-login/gpe-login_0.86.bb @@ -7,7 +7,7 @@ PRIORITY = "optional" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd" RPROVIDES = "gpe-session-starter" -PR = "r0" +PR = "r1" #apply a patch to set the fontsize for bigdpi (200+) devices to 5 SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" @@ -16,3 +16,4 @@ SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" +SRC_URI_append += " file://chvt-keylaunch.patch;patch=1 " -- cgit v1.2.3 From 130a448a3293d3918a26c573c3317315c5d8187a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 28 May 2006 20:43:09 +0000 Subject: generic(-uclibc).conf: add 'reference' distribution configuration this should serve as a starting point for people adding new models and new distributions. It should always be buildable, so please use it for regression tests and keep it up to date! Be sure to comment everything you add. --- conf/distro/generic-uclibc.conf | 24 +++++++++++++++ conf/distro/generic.conf | 67 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 conf/distro/generic-uclibc.conf diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf new file mode 100644 index 0000000000..d9ace6d629 --- /dev/null +++ b/conf/distro/generic-uclibc.conf @@ -0,0 +1,24 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Generic uClibC +#@DESCRIPTION: Generic uClibC Embedded Linux Distribution Configuration +# +#@COMMENT: This distribution configuration serves as a starting point for +#@COMMENT: the integration of new target platforms, machines, or distributions. +#@COMMENT: It bases on conservative settings and should always be buildable. +#----------------------------------------------------------------------------- + +require conf/distro/generic.conf + +# +# Header +# +DISTRO_NAME = "generic-uClibC" + +# +# Target OS and FPU system +# +TARGET_OS = "linux-uclibc" +TARGET_FPU = "soft" +PREFERRED_PROVIDER_virtual/libiconv = "libiconv" +PREFERRED_PROVIDER_virtual/libintl = "libintl" diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 59e003f9b3..e6671d1337 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -1,16 +1,69 @@ +#----------------------------------------------------------------------------- #@TYPE: Distribution #@NAME: Generic -#@DESCRIPTION: Generic Linux Distribution Configuration +#@DESCRIPTION: Generic Embedded Linux Distribution Configuration +# +#@COMMENT: This distribution configuration serves as a starting point for +#@COMMENT: the integration of new target platforms, machines, or distributions. +#@COMMENT: It bases on conservative settings and should always be buildable. +#----------------------------------------------------------------------------- -INHERIT += " package_ipk debian" -TARGET_OS = "linux" -# TARGET_FPU = "soft" -IMAGE_FSTYPES = "ext2.gz" - -DISTRO_NAME = "GenericDistribution" +# +# Header +# +DISTRO_NAME = "generic-glibc" DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" + +# +# Naming schemes +# +PARALLEL_INSTALL_MODULES = "1" +INHERIT += "debian multimachine" + +# +# Packaging and output format +# +INHERIT += "package_ipk" +IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" + +# +# Binutils & Compiler +# +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" +PREFERRED_VERSION_gcc = "3.4.4" +PREFERRED_VERSION_gcc-cross = "3.4.4" +PREFERRED_VERSION_gcc-cross-initial = "3.4.4" +PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" +PREFERRED_VERSION_binutils = "2.15.94.0.1" + +# +# Target OS and FPU system +# +TARGET_OS = "linux" +TARGET_FPU = "soft" +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" +PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" + +# +# GPE +# require conf/distro/preferred-gpe-versions.inc + +# +# Opie +# +QTE_VERSION = "2.3.10" +PALMTOP_USE_MULTITHREADED_QTE = "yes" require conf/distro/preferred-opie-versions.inc + +# +# Enlightenment +# require conf/distro/preferred-e-versions.inc -- cgit v1.2.3 From a0031cf53886cd7ee3b2cacc007b4ec636a3920e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 29 May 2006 10:10:02 +0000 Subject: glibc 2.4: hopefully solve the do_stage loop --- packages/glibc/glibc_2.4.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 2cc568df6f..45174d0551 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -6,6 +6,11 @@ PRIORITY = "required" DEFAULT_PREFERENCE = "-1" PR = "r5" +# the -isystem in bitbake.conf screws up glibc do_stage +BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" +TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" + + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" GLIBC_ADDONS ?= "ports,nptl,libidn" -- cgit v1.2.3 From 0035111287b09fedc7eef3d7e4808acf74ba5c3b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 29 May 2006 11:10:14 +0000 Subject: cherokee: granular packaging, enabled PARALLEL_MAKE --- packages/cherokee/cherokee_0.5.3.bb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/cherokee/cherokee_0.5.3.bb b/packages/cherokee/cherokee_0.5.3.bb index e6ea8e03fb..c7cd02c70d 100644 --- a/packages/cherokee/cherokee_0.5.3.bb +++ b/packages/cherokee/cherokee_0.5.3.bb @@ -1,19 +1,17 @@ DESCRIPTION = "Cherokee Web Server fast and secure" +DESCRIPTION_cget = "Small downloader based in the Cherokee client library" LICENSE = "GPL" DEPENDS = "pcre gnutls" HOMEPAGE = "http://www.0x50.org/" +PR = "r1" + SRC_URI = "http://www.0x50.org/download/0.5/${PV}/${P}.tar.gz \ file://configure.patch;patch=1 \ file://Makefile.in.patch;patch=1 \ file://Makefile.cget.patch;patch=1 \ - file://util.patch;patch=1 \ -" - -inherit autotools - -PARALLEL_MAKE="" + file://util.patch;patch=1" -LEAD_SONAME = "libcherokee-base" +inherit autotools pkgconfig binconfig EXTRA_OECONF = "--enable-tls=gnutls --disable-static --disable-nls" @@ -26,3 +24,10 @@ do_configure() { do_install_prepend () { $BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c } + +PACKAGES =+ "cget libcherokee-server libcherokee-client libcherokee-base" + +FILES_cget = "${bindir}/cget" +FILES_libcherokee-server = "${libdir}/libcherokee-server*" +FILES_libcherokee-client = "${libdir}/libcherokee-client*" +FILES_libcherokee-base = "${libdir}/libcherokee-base*" -- cgit v1.2.3 From bc8b949cfbab0654d2818894c1c22c0002a6c010 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 29 May 2006 13:30:23 +0000 Subject: qpegps: add 0.9.2.3.3, remove 0.9.2.3 --- packages/qpegps/qpegps_0.9.2.3.2.bb | 35 ----------------------------------- packages/qpegps/qpegps_0.9.2.3.3.bb | 34 ++++++++++++++++++++++++++++++++++ packages/qpegps/qpegps_0.9.2.3.bb | 35 ----------------------------------- 3 files changed, 34 insertions(+), 70 deletions(-) delete mode 100644 packages/qpegps/qpegps_0.9.2.3.2.bb create mode 100644 packages/qpegps/qpegps_0.9.2.3.3.bb delete mode 100644 packages/qpegps/qpegps_0.9.2.3.bb diff --git a/packages/qpegps/qpegps_0.9.2.3.2.bb b/packages/qpegps/qpegps_0.9.2.3.2.bb deleted file mode 100644 index 073b95a96a..0000000000 --- a/packages/qpegps/qpegps_0.9.2.3.2.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Navigation application for use with GPS adapters" -SECTION = "opie/applications" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -RRECOMMENDS = "gpsd" -LICENSE = "GPL" -HOMEPAGE = "http://qpegps.sourceforge.net/" -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \ - file://qpegps.desktop \ - file://qpegps.png" -S = "${WORKDIR}/qpegps_my" - -inherit palmtop - -QMAKE_PROFILES = "qpegps.pro" -EXTRA_QMAKEVARS_POST += "LIBS=-lqpe" - -do_install() { - install -d ${D}${palmtopdir}/bin \ - ${D}${palmtopdir}/apps/Applications \ - ${D}${palmtopdir}/pics/qpegps \ - ${D}${palmtopdir}/help/html/qpegps_icons \ - ${D}${palmtopdir}/qpegps/maps \ - ${D}${palmtopdir}/qpegps/icons \ - ${D}${palmtopdir}/qpegps/tracks - install -m 0755 qpegps ${D}${palmtopdir}/bin/ - install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/ - install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/ - install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/ - install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/ - install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/ - install -m 0644 datum/*.dat ${D}${palmtopdir}/qpegps/ -} diff --git a/packages/qpegps/qpegps_0.9.2.3.3.bb b/packages/qpegps/qpegps_0.9.2.3.3.bb new file mode 100644 index 0000000000..d93ee529b8 --- /dev/null +++ b/packages/qpegps/qpegps_0.9.2.3.3.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "A GPS navigation application for the Opie environment." +SECTION = "opie/applications" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +RRECOMMENDS = "gpsd" +LICENSE = "GPL" +HOMEPAGE = "http://qpegps.sourceforge.net/" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \ + file://qpegps.desktop \ + file://qpegps.png" +S = "${WORKDIR}/qpegps_my" + +inherit palmtop + +QMAKE_PROFILES = "qpegps.pro" + +do_install() { + install -d ${D}${palmtopdir}/bin \ + ${D}${palmtopdir}/apps/Applications \ + ${D}${palmtopdir}/pics/qpegps \ + ${D}${palmtopdir}/help/html/qpegps_icons \ + ${D}${palmtopdir}/qpegps/maps \ + ${D}${palmtopdir}/qpegps/icons \ + ${D}${palmtopdir}/qpegps/tracks + install -m 0755 qpegps ${D}${palmtopdir}/bin/ + install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/ + install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/ + install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/ + install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/ + install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/ + install -m 0644 datum/*.dat ${D}${palmtopdir}/qpegps/ +} diff --git a/packages/qpegps/qpegps_0.9.2.3.bb b/packages/qpegps/qpegps_0.9.2.3.bb deleted file mode 100644 index 0b4e5e3ccd..0000000000 --- a/packages/qpegps/qpegps_0.9.2.3.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Navigation application for use with GPS adapters" -SECTION = "opie/applications" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -RRECOMMENDS = "gpsd" -LICENSE = "GPL" -HOMEPAGE = "http://qpegps.sourceforge.net/" -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_source.zip \ - file://qpegps.desktop \ - file://qpegps.png" -S = "${WORKDIR}/root/qpegps_src_my/qpegps_my" - -inherit palmtop - -QMAKE_PROFILES = "qpegps.pro" -EXTRA_QMAKEVARS_POST += "LIBS=-lqpe" - -do_install() { - install -d ${D}${palmtopdir}/bin \ - ${D}${palmtopdir}/apps/Applications \ - ${D}${palmtopdir}/pics/qpegps \ - ${D}${palmtopdir}/help/html/qpegps_icons \ - ${D}${palmtopdir}/qpegps/maps \ - ${D}${palmtopdir}/qpegps/icons \ - ${D}${palmtopdir}/qpegps/tracks - install -m 0755 qpegps ${D}${palmtopdir}/bin/ - install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/ - install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/ - install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/ - install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/ - install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/ - install -m 0644 datum/*.dat ${D}${palmtopdir}/qpegps/ -} -- cgit v1.2.3 From e79c03d688f236bee98269b9b3d8d17c587cf73e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 29 May 2006 13:36:17 +0000 Subject: libsoup: unbreak staging --- packages/gnome/libsoup_2.2.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gnome/libsoup_2.2.7.bb b/packages/gnome/libsoup_2.2.7.bb index e97a11cc96..f01cb19dbc 100644 --- a/packages/gnome/libsoup_2.2.7.bb +++ b/packages/gnome/libsoup_2.2.7.bb @@ -14,5 +14,5 @@ FILES_${PN}-doc = "${datadir}" do_stage() { autotools_stage_all install -d ${STAGING_DATADIR}/pkgconfig - install -m 0644 ${D}${libdir}/pkgconfig/* ${STAGING_DATADIR}/pkgconfig/ + install -m 0644 ${S}/*.pc ${STAGING_DATADIR}/pkgconfig/ } -- cgit v1.2.3 From 2db3499796223578d281d5503997e9716cf7421a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 29 May 2006 13:36:57 +0000 Subject: libeventdb: update PV --- packages/libeventdb/libeventdb_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libeventdb/libeventdb_cvs.bb b/packages/libeventdb/libeventdb_cvs.bb index 83f938ff62..1a4a5c21ba 100644 --- a/packages/libeventdb/libeventdb_cvs.bb +++ b/packages/libeventdb/libeventdb_cvs.bb @@ -4,7 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "libgpewidget libgpepimc sqlite" MAINTAINER = "Florian Boor " -PV = "0.21+cvs${SRCDATE}" +PV = "0.30+cvs${SRCDATE}" PR = "r0" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From bd3c7b8587568007084cb787324e6c3f445f6fdc Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 29 May 2006 16:52:22 +0000 Subject: netbase: add proper interfaces file for Motorola GSM Phones --- packages/netbase/netbase/a780/.mtn2git_empty | 0 packages/netbase/netbase/a780/interfaces | 44 ++++++++++++++++++++++++++++ packages/netbase/netbase/e680/.mtn2git_empty | 0 packages/netbase/netbase/e680/interfaces | 44 ++++++++++++++++++++++++++++ packages/netbase/netbase_4.21.bb | 4 +-- 5 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 packages/netbase/netbase/a780/.mtn2git_empty create mode 100644 packages/netbase/netbase/a780/interfaces create mode 100644 packages/netbase/netbase/e680/.mtn2git_empty create mode 100644 packages/netbase/netbase/e680/interfaces diff --git a/packages/netbase/netbase/a780/.mtn2git_empty b/packages/netbase/netbase/a780/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/netbase/netbase/a780/interfaces b/packages/netbase/netbase/a780/interfaces new file mode 100644 index 0000000000..4e5d85e2c7 --- /dev/null +++ b/packages/netbase/netbase/a780/interfaces @@ -0,0 +1,44 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Wireless interfaces +iface wlan0 inet dhcp +wireless_mode managed +wireless_essid any +iface atml0 inet dhcp + +# Wired or wireless interfaces +iface eth0 inet dhcp +iface eth1 inet dhcp + +auto usb0 +# Ethernet/RNDIS gadget (g_ether) +# ... or on host side, usbnet and random hwaddr +iface usb0 inet static + address 192.168.1.2 + netmask 255.255.255.0 + network 192.168.1.0 + gateway 192.168.1.10 + + +# Zaurus 2.4 Lineo net_fd; obsolete +iface usbd0 inet static + address 192.168.129.201 + netmask 255.255.255.0 + network 192.168.129.0 + gateway 192.168.129.200 + +# iPAQ 2.4 mach-sa1100/usb-eth +# (192.168.0.202 is the iPAQ's IP, 192.168.0.200 is the host's IP) +iface usbf inet static + address 192.168.0.202 + netmask 255.255.255.0 + network 192.168.0.0 + gateway 192.168.0.200 + +# Bluetooth networking +iface bnep0 inet dhcp + diff --git a/packages/netbase/netbase/e680/.mtn2git_empty b/packages/netbase/netbase/e680/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/netbase/netbase/e680/interfaces b/packages/netbase/netbase/e680/interfaces new file mode 100644 index 0000000000..4e5d85e2c7 --- /dev/null +++ b/packages/netbase/netbase/e680/interfaces @@ -0,0 +1,44 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Wireless interfaces +iface wlan0 inet dhcp +wireless_mode managed +wireless_essid any +iface atml0 inet dhcp + +# Wired or wireless interfaces +iface eth0 inet dhcp +iface eth1 inet dhcp + +auto usb0 +# Ethernet/RNDIS gadget (g_ether) +# ... or on host side, usbnet and random hwaddr +iface usb0 inet static + address 192.168.1.2 + netmask 255.255.255.0 + network 192.168.1.0 + gateway 192.168.1.10 + + +# Zaurus 2.4 Lineo net_fd; obsolete +iface usbd0 inet static + address 192.168.129.201 + netmask 255.255.255.0 + network 192.168.129.0 + gateway 192.168.129.200 + +# iPAQ 2.4 mach-sa1100/usb-eth +# (192.168.0.202 is the iPAQ's IP, 192.168.0.200 is the host's IP) +iface usbf inet static + address 192.168.0.202 + netmask 255.255.255.0 + network 192.168.0.0 + gateway 192.168.0.200 + +# Bluetooth networking +iface bnep0 inet dhcp + diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index d5526776eb..d79dbc2a26 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -1,8 +1,8 @@ -SECTION = "base" DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." +SECTION = "base" LICENSE = "GPL" -PR = "r10" +PR = "r11" inherit update-rc.d -- cgit v1.2.3 From 48102a38d32a8dd0e1644d7219d7edcf19f77338 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 29 May 2006 16:53:06 +0000 Subject: qte(-mt): touchscreen works on Motorola EZX platform now --- packages/qte/qte-common_2.3.10.inc | 4 ++-- packages/qte/qte-mt-static_2.3.10.bb | 2 +- packages/qte/qte-mt-static_2.3.12.bb | 2 +- packages/qte/qte-mt_2.3.10.bb | 2 +- packages/qte/qte-mt_2.3.12.bb | 2 +- packages/qte/qte_2.3.10.bb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index a95ed57f0a..3f497c9058 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -99,8 +99,8 @@ EXTRA_OEMAKE = "-e" EXTRA_DEFINES = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE" EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_a780 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_EZX" -EXTRA_DEFINES_e680 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_EZX" +EXTRA_DEFINES_a780 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_EZX" +EXTRA_DEFINES_e680 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_EZX EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_SL5XXX -DQT_QWS_SL6000" EXTRA_DEFINES_h3600 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h3900 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb index 0c0c965a87..4f2c0f945b 100644 --- a/packages/qte/qte-mt-static_2.3.10.bb +++ b/packages/qte/qte-mt-static_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r1" +PR = "r2" EXTRA_OECONF += "-static" diff --git a/packages/qte/qte-mt-static_2.3.12.bb b/packages/qte/qte-mt-static_2.3.12.bb index 1aa7338f9b..7cc0b3fdc0 100644 --- a/packages/qte/qte-mt-static_2.3.12.bb +++ b/packages/qte/qte-mt-static_2.3.12.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r1" +PR = "r2" EXTRA_OECONF += "-static" diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index 3ef3263151..90e84fe38d 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r1" +PR = "r2" EXTRA_OECONF += "-thread" diff --git a/packages/qte/qte-mt_2.3.12.bb b/packages/qte/qte-mt_2.3.12.bb index 6c328b55f5..3ef3263151 100644 --- a/packages/qte/qte-mt_2.3.12.bb +++ b/packages/qte/qte-mt_2.3.12.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r0" +PR = "r1" EXTRA_OECONF += "-thread" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index 290c4dc3b3..b1c4616f22 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -1,3 +1,3 @@ require qte-common_${PV}.inc -PR = "r42" +PR = "r43" -- cgit v1.2.3 From 80a6f2987526931118e598d02e8b8b3b6e048b5f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 29 May 2006 19:51:35 +0000 Subject: gpe-calendar: add libhandoff to depends --- packages/gpe-calendar/gpe-calendar_cvs.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gpe-calendar/gpe-calendar_cvs.bb b/packages/gpe-calendar/gpe-calendar_cvs.bb index 06252e67bd..f75987c762 100644 --- a/packages/gpe-calendar/gpe-calendar_cvs.bb +++ b/packages/gpe-calendar/gpe-calendar_cvs.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.72+cvs${SRCDATE}" +PV = "0.73+cvs${SRCDATE}" PR = "r1" PARALLEL_MAKE = "" @@ -10,7 +10,7 @@ inherit autotools gpe SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" -DEPENDS = "libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" +DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" SECTION = "gpe" RDEPENDS = "gpe-icons" DESCRIPTION = "GPE calendar" -- cgit v1.2.3 From cad552410b99c1b9a56ace1939f95807c22eb85f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 29 May 2006 21:50:35 +0000 Subject: gpe-login: add 0.87 --- packages/gpe-login/gpe-login-0.87/.mtn2git_empty | 0 .../gpe-login/gpe-login-0.87/chvt-keylaunch.patch | 12 ++++++++++++ packages/gpe-login/gpe-login_0.87.bb | 19 +++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 packages/gpe-login/gpe-login-0.87/.mtn2git_empty create mode 100644 packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch create mode 100644 packages/gpe-login/gpe-login_0.87.bb diff --git a/packages/gpe-login/gpe-login-0.87/.mtn2git_empty b/packages/gpe-login/gpe-login-0.87/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch new file mode 100644 index 0000000000..798c059ccc --- /dev/null +++ b/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch @@ -0,0 +1,12 @@ +--- /tmp/gpe-login.keylaunchrc 2006-05-29 23:46:42.806081576 +0200 ++++ gpe-login-0.87/gpe-login.keylaunchrc 2006-05-29 23:48:18.476537456 +0200 +@@ -1,3 +1,9 @@ + key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh + key=????XF86PowerDown:-:/usr/bin/apm --suspend + key=????Held XF86PowerDown:-:bl toggle ++ ++# VT changing ++key=...*Left:-:~chvt 1 ++key=...*Right:-:~chvt 3 ++key=...*Escape:-:~/etc/init.d/gpe-dm stop ++ diff --git a/packages/gpe-login/gpe-login_0.87.bb b/packages/gpe-login/gpe-login_0.87.bb new file mode 100644 index 0000000000..5d7f00530c --- /dev/null +++ b/packages/gpe-login/gpe-login_0.87.bb @@ -0,0 +1,19 @@ +LICENSE = "GPL" +inherit gpe + +DESCRIPTION = "GPE user login screen" +SECTION = "gpe" +PRIORITY = "optional" +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd" +RPROVIDES = "gpe-session-starter" +PR = "r0" + +#apply a patch to set the fontsize for bigdpi (200+) devices to 5 +SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" +SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1" +SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" +SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" +SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" + +SRC_URI += " file://chvt-keylaunch.patch;patch=1 " -- cgit v1.2.3 From 887011f6f665e04a84b2f25bb902c2196f928b6d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 30 May 2006 05:50:54 +0000 Subject: libhandoff: glib -> glib-2.0 --- packages/libhandoff/libhandoff_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libhandoff/libhandoff_cvs.bb b/packages/libhandoff/libhandoff_cvs.bb index 54ffafc5e9..2a1b70852d 100644 --- a/packages/libhandoff/libhandoff_cvs.bb +++ b/packages/libhandoff/libhandoff_cvs.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DESCRIPTION = "handoff library for GPE calendar" SECTION = "gpe/libs" PRIORITY = "optional" -DEPENDS = "glib" +DEPENDS = "glib-2.0" PV = "0.1+cvs${SRCDATE}" PR = "r0" MAINTAINER = "Koen Kooi " -- cgit v1.2.3 From e46354c874f55f6f239a8afd923dadce4356dec7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 30 May 2006 09:57:01 +0000 Subject: ezx: catch up with upstream source tree movements... --- packages/ezx/ezx-boot-usb-native_svn.bb | 5 ++++- packages/ezx/ezx-gpiotool_svn.bb | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/ezx/ezx-boot-usb-native_svn.bb b/packages/ezx/ezx-boot-usb-native_svn.bb index 6bcc80e4ce..80dcb3533d 100644 --- a/packages/ezx/ezx-boot-usb-native_svn.bb +++ b/packages/ezx/ezx-boot-usb-native_svn.bb @@ -1,9 +1,12 @@ DESCRIPTION = "Boots an EZX device with a user supplied kernel zImage" DEPENDS = "libusb-native" SECTION = "devel" +AUTHOR = "Harald Welte" +MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" +PR = "r1" -SRC_URI = "svn://svn.openezx.org/trunk/src;module=boot_usb;proto=http" +SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http" S = "${WORKDIR}/boot_usb" inherit native diff --git a/packages/ezx/ezx-gpiotool_svn.bb b/packages/ezx/ezx-gpiotool_svn.bb index e483c4091c..c9b35f7df6 100644 --- a/packages/ezx/ezx-gpiotool_svn.bb +++ b/packages/ezx/ezx-gpiotool_svn.bb @@ -4,8 +4,9 @@ LICENSE = "GPL" HOMEPAGE = "http://openezx.org" AUTHOR = "Harald Welte" MAINTAINER = "Michael 'Mickey' Lauer " +PR = "r1" -SRC_URI = "svn://svn.openezx.org/trunk/src;module=gpiotool;proto=http" +SRC_URI = "svn://svn.openezx.org/trunk/src/userspace;module=gpiotool;proto=http" S = "${WORKDIR}/gpiotool" do_compile() { -- cgit v1.2.3 From 3e70f1f55a14b23a43512452aae21c1ad1f219eb Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 30 May 2006 12:49:51 +0000 Subject: mplayer_1.0pre7+cvs20060519.bb : add a cvs snapshot of mplayer in prep for a svn version when they get the repos open to public again. Is patched with the w100 driver from mplayer-atty so platforms with w100 can try --enable-w100. --- .../mplayer-1.0pre7+cvs20060519/.mtn2git_empty | 0 .../mplayer-1.0pre7+cvs20060519/Makefile.patch | 11 + .../mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c | 947 +++++ .../mplayer-1.0pre7+cvs20060519/vo_w100_api.h | 306 ++ .../mplayer-1.0pre7+cvs20060519/vo_w100_fb.h | 4338 ++++++++++++++++++++ .../w100-Makefile.patch | 10 + .../w100-configure.patch | 53 + .../mplayer-1.0pre7+cvs20060519/w100-mplayer.patch | 31 + .../w100-video_out.patch | 20 + packages/mplayer/mplayer_1.0pre7+cvs20060519.bb | 73 + 10 files changed, 5789 insertions(+) create mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty create mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch create mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c create mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h create mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h create mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch create mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch create mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch create mode 100644 packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch create mode 100644 packages/mplayer/mplayer_1.0pre7+cvs20060519.bb diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty b/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch b/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch new file mode 100644 index 0000000000..da316ad129 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch @@ -0,0 +1,11 @@ +--- mplayer_20060519/Makefile.orig 2006-05-30 09:32:23.000000000 +0100 ++++ mplayer_20060519/Makefile 2006-05-30 09:34:07.000000000 +0100 +@@ -438,7 +438,7 @@ + $(CC) -DCODECS2HTML codec-cfg.c mp_msg.o -o $@ + + $(PRG_CFG): codec-cfg.c codec-cfg.h help_mp.h +- $(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c -o $(PRG_CFG) \ ++ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. codec-cfg.c -o $(PRG_CFG) \ + -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) + + install: $(ALL_PRG) diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c b/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c new file mode 100644 index 0000000000..702707c656 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c @@ -0,0 +1,947 @@ +/* + * Video driver for ATI Imageon 100 (w100) + * by AGAWA Koji + * (C) 2004 + */ +/* English in this source code is written by machine translation. + Meaning also not leading, permitting. */ + +#include +#include +#include + +#include "config.h" +#include "video_out.h" +#include "video_out_internal.h" +#include "sub.h" +#include "aspect.h" +#include "mp_msg.h" +#include "subopt-helper.h" + +#include "vo_w100_api.h" +#include "vo_w100_fb.h" + +#define UNUSED(v) ((void)(v)) + +static vo_info_t info = { + "ATI Imageon 100", + "w100", + "AGAWA Koji ", + "for Sharp Linux Zaurus SL-C700/750/760/860" +}; + +LIBVO_EXTERN(w100); + +// ---------------------------------------------------------------- +#define MAX_FRAMES 20 +typedef struct vidix_yuv_s +{ + unsigned y,u,v; +}vidix_yuv_t; + +typedef struct vidix_rect_s +{ + unsigned x,y,w,h; /* in pixels */ + vidix_yuv_t pitch; /* line-align in bytes */ +}vidix_rect_t; + +typedef struct w100_yuv_planes_s { + uint8_t *y; + uint8_t *u; + uint8_t *v; +} w100_yuv_planes_t; + +typedef struct w100_priv_s { + uint32_t format; + int src_width; + int src_height; + int nframes; /* total num of frames */ + int current_frame; /* current frame to display */ + int rotate; + int current_rotate; + + /* w100 info */ + int vram_size[2]; /* */ + void *vram_addr[2]; /* address */ + w100_yuv_planes_t frame_addrs[MAX_FRAMES]; + w100_yuv_planes_t frame_offsets[MAX_FRAMES]; + int is_graphic_window_enabled; + int eq_brightness; /* for mplayer */ + int display_brightness; /* for w100 */ + + /* overlay info */ + uint16_t overlay_handle; + ATI_OVERLAYPROP overlay_prop; + int overlay_pos_x; + int overlay_pos_y; + int overlay_expand_h; + int overlay_expand_v; + int overlay_pitch_y; + int overlay_pitch_u; + int overlay_pitch_v; + video_y_offset_u video_y_offset; + video_u_offset_u video_u_offset; + video_v_offset_u video_v_offset; +} w100_priv_t; + +static w100_priv_t st_w100_priv; +static vidix_yuv_t dstrides; + +static int test_rotate(int *arg) +{ + if ((*arg < -1) || (*arg > 3)) + return 0; + return 1; +} + +static opt_t subopts[] = { + { "rotate", OPT_ARG_INT, &st_w100_priv.rotate, (opt_test_f)test_rotate }, + { NULL } +}; + +static void draw_alpha(int x0,int y0, int w,int h, + unsigned char* src, unsigned char *srca, int stride) +{ + w100_priv_t *priv = &st_w100_priv; + uint8_t *psrc, *psrca, *pdst; + pdst = priv->frame_addrs[priv->current_frame].y; + pdst += (x0 * priv->overlay_prop.SrcPitch) + (priv->overlay_prop.SrcPitch - 1 - y0); + psrc = src; + psrca = srca; + while (h--) { + int j; + for (j = 0; j < w; ++j) { + if (psrca[j]) + pdst[j * priv->overlay_prop.SrcPitch] = + ((pdst[j * priv->overlay_prop.SrcPitch] * psrca[j]) >> 8) + psrc[j]; + } + psrc += stride; + psrca += stride; + pdst -= 1; + } +#if 0 + w100_priv_t *priv = &st_w100_priv; + uint32_t apitch, bespitch; + void *lvo_mem; + lvo_mem = priv->frame_addrs[priv->current_frame].y; + apitch = priv->overlay_pitch_y - 1; + switch (priv->format) { + case IMGFMT_YV12: + case IMGFMT_IYUV: + case IMGFMT_I420: + case IMGFMT_YVU9: + case IMGFMT_IF09: + case IMGFMT_Y8: + case IMGFMT_Y800: + bespitch = (priv->src_width + apitch) & (~apitch); + vo_draw_alpha_yv12(w,h,src,srca,stride,lvo_mem+bespitch*y0+x0,bespitch); + break; + case IMGFMT_YUY2: + bespitch = (priv->src_width*2 + apitch) & (~apitch); + vo_draw_alpha_yuy2(w,h,src,srca,stride,lvo_mem+bespitch*y0+2*x0,bespitch); + break; + case IMGFMT_UYVY: + bespitch = (priv->src_width*2 + apitch) & (~apitch); + vo_draw_alpha_yuy2(w,h,src,srca,stride,lvo_mem+bespitch*y0+2*x0+1,bespitch); + break; + case IMGFMT_RGB32: + case IMGFMT_BGR32: + bespitch = (priv->src_width*4 + apitch) & (~apitch); + vo_draw_alpha_rgb32(w,h,src,srca,stride,lvo_mem+y0*bespitch+4*x0,bespitch); + break; + case IMGFMT_RGB24: + case IMGFMT_BGR24: + bespitch = (priv->src_width*3 + apitch) & (~apitch); + vo_draw_alpha_rgb24(w,h,src,srca,stride,lvo_mem+y0*bespitch+3*x0,bespitch); + break; + case IMGFMT_RGB16: + case IMGFMT_BGR16: + bespitch = (priv->src_width*2 + apitch) & (~apitch); + vo_draw_alpha_rgb16(w,h,src,srca,stride,lvo_mem+y0*bespitch+2*x0,bespitch); + break; + case IMGFMT_RGB15: + case IMGFMT_BGR15: + bespitch = (priv->src_width*2 + apitch) & (~apitch); + vo_draw_alpha_rgb15(w,h,src,srca,stride,lvo_mem+y0*bespitch+2*x0,bespitch); + break; + default: + return; + } +#endif +} + +static uint32_t w100_draw_slice_420(uint8_t *image[], int stride[], + int w, int h, int x, int y) +{ + w100_priv_t *priv = &st_w100_priv; + uint8_t *src; + uint8_t *dest; + int i; + + /* Plane Y */ + dest = priv->frame_addrs[priv->current_frame].y; + dest += dstrides.y * y + x; + src = image[0]; + for (i = 0; i < h; ++i) { + memcpy(dest, src, w); + src += stride[0]; + dest += dstrides.y; + } + + /* Plane V */ + dest = priv->frame_addrs[priv->current_frame].u; + dest += dstrides.v * y / 4 + x; + src = image[1]; + for (i = 0; i < h / 2; ++i) { + memcpy(dest, src, w / 2); + src += stride[1]; + dest += dstrides.v / 2; + } + + /* Plane U */ + dest = priv->frame_addrs[priv->current_frame].v; + dest += dstrides.u * y / 4 + x; + src = image[2]; + for (i = 0; i < h / 2; ++i) { + memcpy(dest, src, w / 2); + src += stride[2]; + dest += dstrides.u / 2; + } + + return 0; +} + +/* + w must be multiple of 8 + */ +static uint32_t w100_draw_slice_420_rotate3(uint8_t *image[], int stride[], + int w, int h, int x, int y) +{ + w100_priv_t *priv = &st_w100_priv; + void *src, *dest; + int i, dpitch2, h_; + + h_ = h; + + for (i = 0; i < 3; ++i) { + src = image[i]; + switch (i) { + case 0: + dest = priv->frame_addrs[priv->current_frame].y; + dest += dstrides.y * x + dstrides.y - y; + dpitch2 = dstrides.y << 1; + break; + case 1: + dest = priv->frame_addrs[priv->current_frame].u; + dest += (dstrides.y >> 1) * (x >> 1) + (dstrides.y >> 1) - (y >> 1); + dpitch2 = dstrides.y; + h = h_ >> 1; + w >>= 1; + break; + case 2: + dest = priv->frame_addrs[priv->current_frame].v; + dest += (dstrides.y >> 1) * (x >> 1) + (dstrides.y >> 1) - (y >> 1); + h = h_ >> 1; + dpitch2 = dstrides.y; + break; + } + + __asm__ __volatile__ ( + "1: \n\t" + "mov r8, %[w] \n\t" + "sub %[dest], %[dest], #1 \n\t" + "mov r4, %[dest] \n\t" + "add r5, %[dest], %[dpitch2], lsr #1 \n\t" + + "2: \n\t" + "ldrb r0, [%[src]] \n\t" + "ldrb r1, [%[src], #1] \n\t" + "add %[src], %[src], #2 \n\t" + "strb r0, [r4] \n\t" + "strb r1, [r5] \n\t" + "add r4, r4, %[dpitch2] \n\t" + "add r5, r5, %[dpitch2] \n\t" + "ldrb r0, [%[src]] \n\t" + "ldrb r1, [%[src], #1] \n\t" + "add %[src], %[src], #2 \n\t" + "strb r0, [r4] \n\t" + "strb r1, [r5] \n\t" + "add r4, r4, %[dpitch2] \n\t" + "add r5, r5, %[dpitch2] \n\t" + "subs r8, r8, #4 \n\t" + "bne 2b \n\t" + + "add %[src], %[src], %[srcdiff] \n\t" + "subs %[h], %[h], #1 \n\t" + "bne 1b \n\t" + : [src]"+r"(src), [dest]"+r"(dest), [h]"+r"(h) + : [dpitch2]"r"(dpitch2), [w]"r"(w), [srcdiff]"r"(stride[i] - w) + : "memory", "r0", "r1", "r4", "r5", "r8"); + } +} + +static uint32_t w100_draw_slice_packed(uint8_t *image[], int stride[], + int w, int h, int x, int y) +{ +#if 0 + uint8_t *src; + uint8_t *dest; + int i; + + dest = st_w100_mem + vidix_play.offsets[st_next_frame] + vidix_play.offset.y; + dest += dstrides.y * y + x; + src = image[0]; + for (i = 0; i < h; ++i) { + memcpy(dest, src, w * st_image_bpp); + src += stride[0]; + dest += dstrides.y; + } +#endif + return 0; +} + +static uint32_t w100_get_image(mp_image_t *mpi) +{ +#if 0 + mp_msg(MSGT_VO, MSGL_V, "vo_w100: w100_get_image called.\n"); + + if (mpi->type == MP_IMGTYPE_STATIC && st_num_frames > 1) + return VO_FALSE; + if (mpi->flags & MP_IMGFLAG_READABLE) + return VO_FALSE; /* slow video ram */ + if (((mpi->stride[0] == dstrides.y && + (!(mpi->flags & MP_IMGFLAG_PLANAR) || + (mpi->stride[1] == dstrides.u && mpi->stride[2]==dstrides.v))) + || (mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH))) && + (!(vidix_play.flags & VID_PLAY_INTERLEAVED_UV))) { + if (mpi->flags & MP_IMGFLAG_ACCEPT_WIDTH) { + // check if only width is enough to represent strides: + if (mpi->flags & MP_IMGFLAG_PLANAR) { + if ((dstrides.y >> 1) != dstrides.v || dstrides.v != dstrides.u) + return VO_FALSE; + } else { + if (dstrides.y % (mpi->bpp / 8)) + return VO_FALSE; + } + } + mpi->planes[0] = st_w100_mem + vidix_play.offsets[st_next_frame] + + vidix_play.offset.y; + mpi->width = mpi->stride[0] = dstrides.y; + if (mpi->flags & MP_IMGFLAG_PLANAR) { + mpi->planes[1] = st_w100_mem + vidix_play.offsets[st_next_frame] + + vidix_play.offset.v; + mpi->stride[1] = dstrides.v >> mpi->chroma_x_shift; + mpi->planes[2] = st_w100_mem + vidix_play.offsets[st_next_frame] + + vidix_play.offset.u; + mpi->stride[2] = dstrides.u >> mpi->chroma_x_shift; + } else + mpi->width /= mpi->bpp / 8; + mpi->flags |= MP_IMGFLAG_DIRECT; + return VO_TRUE; + } +#endif + return VO_FALSE; +} + +static void w100_set_yuv_addrs(w100_priv_t *priv, w100_yuv_planes_t *offsets) +{ + uint32_t val; + + priv->video_y_offset.f.y_offset = GetRealMemAddr((uint32_t)offsets->y); + priv->video_u_offset.f.u_offset = GetRealMemAddr((uint32_t)offsets->u); + priv->video_v_offset.f.v_offset = GetRealMemAddr((uint32_t)offsets->v); + AtiCore_WriteReg(mmVIDEO_Y_OFFSET, (uint32_t *)&priv->video_y_offset); + AtiCore_WriteReg(mmVIDEO_U_OFFSET, (uint32_t *)&priv->video_u_offset); + AtiCore_WriteReg(mmVIDEO_V_OFFSET, (uint32_t *)&priv->video_v_offset); + + val = 0x7B; + AtiCore_WriteReg(mmDISP_DB_BUF_CNTL, &val); +} + +static void w100_set_overlay_expand(w100_priv_t *priv, int exp_h, int exp_v) +{ + video_ctrl_u video_ctrl; + + priv->overlay_expand_h = exp_h; + priv->overlay_expand_v = exp_v; + + AtiCore_ReadReg(mmVIDEO_CTRL, (uint32_t *)&video_ctrl); + video_ctrl.f.video_hor_exp = exp_h; + video_ctrl.f.video_ver_exp = exp_v; + AtiCore_WriteReg(mmVIDEO_CTRL, (uint32_t *)&video_ctrl); +} + +static int w100_setup(w100_priv_t *priv) +{ + if (!AtiCore_AllocOverlay(&priv->overlay_handle)) { + mp_msg(MSGT_VO, MSGL_FATAL, + "vo_w100: AtiCore_AllocOverlay failed.\n"); + return 0; + } + if (!AtiCore_SetupOverlay(priv->overlay_handle, &priv->overlay_prop)) { + mp_msg(MSGT_VO, MSGL_FATAL, + "vo_w100: AtiCore_SetupOverlay failed.\n"); + return 0; + } + AtiCore_SetOverlayPos(priv->overlay_handle, + priv->overlay_pos_x, priv->overlay_pos_y); + AtiCore_SetOverlayOnOff(priv->overlay_handle, 1); + w100_set_yuv_addrs(priv, &priv->frame_offsets[priv->current_frame]); + w100_set_overlay_expand(priv, priv->overlay_expand_h, priv->overlay_expand_v); + AtiCore_SetDisplayBrightness(priv->display_brightness); + AtiCore_SetGraphicWindowOnOff(priv->is_graphic_window_enabled); + +/* graphic_ctrl_t gc; */ +/* AtiCore_ReadReg(mmGRAPHIC_CTRL, &gc); */ +/* gc.low_power_on = 0; */ +/* AtiCore_WriteReg(mmGRAPHIC_CTRL, &gc); */ + + return 1; +} + +static void *w100_offset2addr(uint32_t offset) +{ + void *addr; + AtiCore_SetupMemoryTransfer((uint32_t)offset, &addr); + AtiCore_TerminateMemoryTransfer(); + return addr; +} + +// ---------------------------------------------------------------- interfaces +/* + * Preinitializes driver (real INITIALIZATION) + * arg - currently it's vo_subdevice + * returns: zero on successful initialization, non-zero on error. + */ +static int preinit(const char *vo_subdevice) +{ + w100_priv_t *priv = &st_w100_priv; + + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: preinit() was called\n"); + + if (!AtiCore_ProcessAttach()) + return -1; + + /* fill w100_priv_t information */ + memset(priv, 0, sizeof(*priv)); + priv->rotate = -1; + + if (subopt_parse(vo_subdevice, subopts) != 0) { + return -1; + } + + priv->is_graphic_window_enabled = 1; + priv->eq_brightness = 0; /* FIXME */ + + GetAvailableVideoMem(&priv->vram_size[INTERNAL_VRAM], + &priv->vram_size[EXTERNAL_VRAM]); + mp_msg(MSGT_VO, MSGL_V, "vo_w100: VRAM size %dKB/%dKB\n", + priv->vram_size[INTERNAL_VRAM] / 1024, + priv->vram_size[EXTERNAL_VRAM] / 1024); + + priv->vram_addr[INTERNAL_VRAM] = w100_offset2addr(VRAM_OFFSET_INTERNAL); + priv->vram_addr[EXTERNAL_VRAM] = w100_offset2addr(VRAM_OFFSET_EXTERNAL); + mp_msg(MSGT_VO, MSGL_V, "vo_w100: VRAM address 0x%08x/0x%08x\n", + priv->vram_addr[INTERNAL_VRAM], priv->vram_addr[EXTERNAL_VRAM]); + + lcd_background_color_u lbc; + lbc.f.lcd_bg_red = 0; + lbc.f.lcd_bg_green = 0; + lbc.f.lcd_bg_blue = 0; + AtiCore_WriteReg(mmLCD_BACKGROUND_COLOR, &lbc); + + return 0; +} + +/* + * Initialize (means CONFIGURE) the display driver. + * params: + * src_width,srcheight: image source size + * dst_width,dst_height: size of the requested window size, just a hint + * fullscreen: flag, 0=windowd 1=fullscreen, just a hint + * title: window title, if available + * format: fourcc of pixel format + * returns : zero on successful initialization, non-zero on error. + */ +static int config(uint32_t src_width, uint32_t src_height, + uint32_t dst_width, uint32_t dst_height, uint32_t flags, + char *title, uint32_t format) +{ + w100_priv_t *priv = &st_w100_priv; + int fs = flags & VOFLAG_FULLSCREEN; + int vm = flags & VOFLAG_MODESWITCHING; + int zoom = flags & VOFLAG_SWSCALE; + int y_pitch, uv_pitch; + int x_res = 480, y_res = 640; + uint32_t apitch; + int i; + uint32_t plane_flags = 0; + + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: config() was called\n"); + mp_msg(MSGT_VO, MSGL_V, "vo_w100: src_width:%d, src_height:%d, dst_width:%d, dst_height:%d\n", + src_width, src_height, dst_width, dst_height); + + if (!query_format(format)) { + printf("vo_w100: unsupported fourcc for this w100 driver: %x (%s)\n", + format, vo_format_name(format)); + return -1; + } + priv->format = format; + + // rotate + if (priv->rotate < 0) { + if (src_width > src_height) { + priv->current_rotate = 3; + } else { + priv->current_rotate = 0; + } + } else + priv->current_rotate = priv->rotate; + if (priv->current_rotate != 0 && priv->current_rotate != 3) { + mp_msg(MSGT_VO, MSGL_FATAL, "vo_w100: Rotate %d not supported\n", priv->current_rotate); + return -1; + } + + if (priv->current_rotate == 1 || priv->current_rotate == 3) { + i = src_width; + src_width = src_height; + src_height = i; + } + + dst_width = src_width; + dst_height = src_height; + + if (fs) { + int arg[] = { 0, 0, 1, 1, 2, 2, 2, 2, 3 }; + int arg2[] = { 1, 2, 4, 8 }; + int hor_exp = x_res / src_width; + int ver_exp = y_res / (src_height - 32); + int expand; + mp_msg(MSGT_VO, MSGL_V, "vo_w100: hor_exp:%d, ver_exp:%d\n", + hor_exp, ver_exp); + if ((hor_exp > 0 && hor_exp <= 8 && arg[hor_exp] >= 0) && + (ver_exp > 0 && ver_exp <= 8 && arg[ver_exp] >= 0)) { + if (arg[hor_exp] > arg[ver_exp]) + expand = arg[ver_exp]; + else + expand = arg[hor_exp]; + } + priv->overlay_expand_h = priv->overlay_expand_v = expand; + dst_width *= arg2[expand]; + dst_height *= arg2[expand]; + if (dst_height > y_res) + dst_height = y_res; + } + + // 表示領域をセンタリング + priv->overlay_pos_x = (x_res - dst_width) / 2; + priv->overlay_pos_y = (y_res - dst_height) / 2; + + // Hardware scaling + geometry(&priv->overlay_pos_x, &priv->overlay_pos_y, + &dst_width, &dst_height, x_res, y_res); + mp_msg(MSGT_VO, MSGL_V, "vo_w100: overlay pos(%d, %d)\n", + priv->overlay_pos_x, priv->overlay_pos_y); + mp_msg(MSGT_VO, MSGL_V, "vo_w100: src size(%dx%d), dst size(%dx%d)\n", + src_width, src_height, dst_width, dst_height); + + /* select first frame */ + priv->current_frame = 0; + + priv->src_width = src_width; + priv->src_height = src_height; + priv->overlay_pitch_y = 16; + priv->overlay_pitch_u = 16; + priv->overlay_pitch_v = 16; + + switch (format) { + case IMGFMT_YV12: + case IMGFMT_IYUV: + case IMGFMT_I420: + case IMGFMT_YVU9: + case IMGFMT_IF09: + case IMGFMT_Y8: + case IMGFMT_Y800: + y_pitch = (src_width + 15) & ~15; + uv_pitch = ((src_width / 2) + 7) & ~7; + break; + default: + return -1; + } + + /* サーフェイスが内蔵VRAMに収まらない場合は、V-Planeを外部VRAMに追い出す。 */ + if (y_pitch * src_height + uv_pitch * src_height > priv->vram_size[INTERNAL_VRAM]) + plane_flags = 4; + + if (vo_doublebuffering) { + if (y_pitch * src_height + uv_pitch * src_height * 2> priv->vram_size[INTERNAL_VRAM]) + plane_flags = 4; + } + + /* 外部VRAMにプレーンを置いた場合は、Graphic windowを切らないと画像が乱れる */ +/* priv->is_graphic_window_enabled = (plane_flags != 0) ? 0 : 1; */ + priv->is_graphic_window_enabled = 0; + + uint32_t p[2] = { + VRAM_OFFSET_INTERNAL, + VRAM_OFFSET_EXTERNAL + 640 * 480 * 2 + }; + i = 0; + while (i < MAX_FRAMES) { + int sel, j; + /* Y-plane */ + sel = plane_flags & 1 ? EXTERNAL_VRAM : INTERNAL_VRAM; + priv->frame_offsets[i].y = (void *)p[sel]; + priv->frame_addrs[i].y = w100_offset2addr(p[sel]); + p[sel] += y_pitch * src_height; + /* U-plane */ + sel = plane_flags & 2 ? EXTERNAL_VRAM : INTERNAL_VRAM; + priv->frame_offsets[i].u = (void *)p[sel]; + priv->frame_addrs[i].u = w100_offset2addr(p[sel]); + p[sel] += uv_pitch * (src_height / 2); + /* V-plane */ + sel = plane_flags & 4 ? EXTERNAL_VRAM : INTERNAL_VRAM; + priv->frame_offsets[i].v = (void *)p[sel]; + priv->frame_addrs[i].v = w100_offset2addr(p[sel]); + p[sel] += uv_pitch * (src_height / 2); + if ((p[INTERNAL_VRAM] - VRAM_OFFSET_INTERNAL >= priv->vram_size[INTERNAL_VRAM]) || + (p[EXTERNAL_VRAM] - VRAM_OFFSET_EXTERNAL >= priv->vram_size[EXTERNAL_VRAM])) + break; + mp_msg(MSGT_VO, MSGL_V, "vo_w100: frame_offsets[%d].y = 0x%08x\n", i, priv->frame_offsets[i].y); + mp_msg(MSGT_VO, MSGL_V, "vo_w100: frame_offsets[%d].u = 0x%08x\n", i, priv->frame_offsets[i].u); + mp_msg(MSGT_VO, MSGL_V, "vo_w100: frame_offsets[%d].v = 0x%08x\n", i, priv->frame_offsets[i].v); + ++i; + } + priv->nframes = i; + if (priv->nframes > MAX_FRAMES) + priv->nframes = MAX_FRAMES; + mp_msg(MSGT_VO, MSGL_V, "vo_w100: nframes = %d\n", priv->nframes); + + priv->overlay_prop.lpSrcBitmap = (void *)(priv->frame_offsets[0].y); + priv->overlay_prop.XCoord = 0; + priv->overlay_prop.YCoord = 0; + priv->overlay_prop.SrcPitch = y_pitch; + priv->overlay_prop.SrcHeight = src_height; + priv->overlay_prop.OverlayWidth = dst_width; + priv->overlay_prop.OverlayHeight = dst_height; + priv->overlay_prop.lpOverlayKey = 0; + priv->overlay_prop.OverlayFormat = OVLTYPE_YUV420; + + priv->display_brightness = 127; + + w100_set_yuv_addrs(priv, &priv->frame_offsets[0]); + + /* clear every frame */ + memset(priv->vram_addr[INTERNAL_VRAM], 0, priv->vram_size[INTERNAL_VRAM]); + memset(priv->vram_addr[EXTERNAL_VRAM] + 640 * 480 * 2, 0, + priv->vram_size[EXTERNAL_VRAM] - 640 * 480 * 2); + + switch (format) { + case IMGFMT_YV12: + case IMGFMT_I420: + case IMGFMT_IYUV: + case IMGFMT_YVU9: + case IMGFMT_IF09: + case IMGFMT_Y800: + case IMGFMT_Y8: + apitch = priv->overlay_pitch_y - 1; + dstrides.y = (src_width + apitch) & ~apitch; + apitch = priv->overlay_pitch_v - 1; + dstrides.v = (src_width + apitch) & ~apitch; + apitch = priv->overlay_pitch_u - 1; + dstrides.u = (src_width + apitch) & ~apitch; +/* st_image_bpp = 1; */ + break; + case IMGFMT_RGB32: + case IMGFMT_BGR32: + apitch = priv->overlay_pitch_y - 1; + dstrides.y = (src_width * 4 + apitch) & ~apitch; + dstrides.u = dstrides.v = 0; +/* st_image_bpp = 4; */ + break; + case IMGFMT_RGB24: + case IMGFMT_BGR24: + apitch = priv->overlay_pitch_y - 1; + dstrides.y = (src_width * 3 + apitch) & ~apitch; + dstrides.u = dstrides.v = 0; +/* st_image_bpp = 3; */ + break; + default: + apitch = priv->overlay_pitch_y - 1; + dstrides.y = (src_width * 2 + apitch) & ~apitch; + dstrides.u = dstrides.v = 0; +/* st_image_bpp = 2; */ + break; + } + + if (format == IMGFMT_YV12 || format == IMGFMT_I420 || format == IMGFMT_IYUV) { + switch (priv->current_rotate) { + case 0: + video_out_w100.draw_slice = w100_draw_slice_420; + break; + case 1: + break; + case 2: + break; + case 3: + video_out_w100.draw_slice = w100_draw_slice_420_rotate3; + break; + default: + video_out_w100.draw_slice = w100_draw_slice_420; + break; + } + } + /* else if (format == IMGFMT_YVU9 || format == IMGFMT_IF09) */ + /* vo_server->draw_slice = w100_draw_slice_410; */ + else + video_out_w100.draw_slice = w100_draw_slice_packed; + + if (!w100_setup(priv)) + return -1; + + return 0; +} + +/* + * Control interface + */ +static int control(uint32_t request, void *data, ...) +{ + w100_priv_t *priv = &st_w100_priv; + switch (request) { + case VOCTRL_GET_IMAGE: + return w100_get_image(data); + case VOCTRL_QUERY_FORMAT: + return query_format(*((uint32_t *)data)); + case VOCTRL_SET_EQUALIZER: + { + va_list ap; + int value; + + va_start(ap, data); + value = va_arg(ap, int); + va_end(ap); + + if (!strcasecmp(data, "brightness")) { + int br; + priv->eq_brightness = value * 10; + br = (priv->eq_brightness + 1000) * 127 / 2000; + if (br < 0) + br = 0; + if (br > 127) + br = 127; + if (br > 64) + br -= 64; + else + br += 64; + priv->display_brightness = br; + + mp_msg(MSGT_VO, MSGL_V, + "vo_w100: control(VOCTRL_SET_EQUALIZER) %d %d\n", + value, br); + + if (AtiCore_SetDisplayBrightness(priv->display_brightness)) + return VO_TRUE; + else + return VO_FALSE; + } + } + case VOCTRL_GET_EQUALIZER: + { + va_list ap; + int *value; + + va_start(ap, data); + value = va_arg(ap, int*); + va_end(ap); + + if (!strcasecmp(data, "brightness")) { + *value = priv->eq_brightness; + return VO_TRUE; + } else + return VO_FALSE; + } + } + + return VO_NOTIMPL; +} + +/* + * Display a new RGB/BGR frame of the video to the screen. + * params: + * src[0] - pointer to the image + */ +int draw_frame(uint8_t *src[]) +{ + mp_msg(MSGT_VO, MSGL_V, "vo_w100: dummy draw_frame() was called\n"); + return -1; +} + +/* + * Draw a planar YUV slice to the buffer: + * params: + * src[3] = source image planes (Y,U,V) + * stride[3] = source image planes line widths (in bytes) + * w,h = width*height of area to be copied (in Y pixels) + * x,y = position at the destination image (in Y pixels) + */ +int draw_slice(uint8_t *src[], int stride[], int w,int h, int x,int y) +{ + mp_msg(MSGT_VO, MSGL_V, "vo_w100: dummy draw_slice() was called\n"); + return -1; +} + + +/* + * Draws OSD to the screen buffer + */ +static void draw_osd(void) +{ + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: draw_osd() was called\n"); + vo_draw_text(st_w100_priv.src_height, st_w100_priv.src_width, draw_alpha); +} + +/* + * Blit/Flip buffer to the screen. Must be called after each frame! + */ +void flip_page(void) +{ + w100_priv_t *priv = &st_w100_priv; + + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: flip_page() was called\n"); + if (vo_doublebuffering) { + w100_set_yuv_addrs(priv, &priv->frame_offsets[priv->current_frame]); + priv->current_frame = (priv->current_frame + 1) % priv->nframes; + } +} + +/* + * This func is called after every frames to handle keyboard and + * other events. It's called in PAUSE mode too! + */ +extern int g_sigcont; +void check_events(void) +{ + w100_priv_t *priv = &st_w100_priv; + + if (g_sigcont) { + mp_msg(MSGT_VO, MSGL_INFO, "vo_w100: SIGCONT recived.\n"); + + /* Immediately after resuming, because kernel modifies the register, it + waits for that. */ + usleep(1000 * 1000); + + /* re-attach */ +#if 0 + /* Hmm... With respect to of context is necessary, but really it + fails. It does not release and also there is no problem. */ + if (!AtiCore_ReleaseOverlay(priv->overlay_handle)) { + mp_msg(MSGT_VO, MSGL_FATAL, + "vo_w100: AtiCore_ReleaseOverlay failed.\n"); + exit_player(NULL); + } +#endif + if (!AtiCore_ProcessDetach()) { + mp_msg(MSGT_VO, MSGL_FATAL, + "vo_w100: AtiCore_ProcessDetach failed.\n"); + exit_player(NULL); + } + if (!AtiCore_ProcessAttach()) { + mp_msg(MSGT_VO, MSGL_FATAL, + "vo_w100: AtiCore_ProcessAttach failed.\n"); + exit_player(NULL); + } + + /* re-setup */ + if (!w100_setup(priv)) + exit_player(NULL); + + g_sigcont = 0; + } +} + +/* + * Closes driver. Should restore the original state of the system. + */ +static void uninit(void) +{ + mp_msg(MSGT_VO, MSGL_V, "vo_w100: uninit() was called\n"); + + AtiCore_SetOverlayOnOff(st_w100_priv.overlay_handle, 0); + AtiCore_ReleaseOverlay(st_w100_priv.overlay_handle); + AtiCore_SetGraphicWindowOnOff(1); + AtiCore_ProcessDetach(); +} + + +// ---------------------------------------------------------------- +static int query_format(uint32_t format) +{ + mp_msg(MSGT_VO, MSGL_V, "vo_w100: query_format was called: %x (%s)\n", + format, vo_format_name(format)); + + if (IMGFMT_IS_RGB(format)) { + /* RGB/BGR Formats */ + // TODO + return 0; + + switch (IMGFMT_RGB_DEPTH(format)) { + case 16: + return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW + | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD | VFCAP_ACCEPT_STRIDE; + break; + } + } else { + /* Planar YUV Formats */ + switch (format) { + case IMGFMT_YV12: + case IMGFMT_IYUV: + case IMGFMT_I420: + case IMGFMT_YVU9: + case IMGFMT_IF09: + case IMGFMT_Y8: + case IMGFMT_Y800: + return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW + | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD | VFCAP_ACCEPT_STRIDE; + break; + } + } + + return 0; +} + +static void dump_vo_info(void) +{ + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: ================================\n"); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_flags:%x\n", vo_flags); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_depthonscreen:%d\n", vo_depthonscreen); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_screenwidth:%d\n", vo_screenwidth); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_screenheight:%d\n", vo_screenheight); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_dx:%d\n", vo_dx); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_dy:%d\n", vo_dy); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_dwidth:%d\n", vo_dwidth); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_dheight:%d\n", vo_dheight); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_dbpp:%d\n", vo_dbpp); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_grabpointer:%d\n", vo_grabpointer); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_doublebuffering:%d\n", vo_doublebuffering); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_directrendering:%d\n", vo_directrendering); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_vsync:%d\n", vo_vsync); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_fs:%d\n", vo_fs); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_fsmode:%d\n", vo_fsmode); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_panscan:%f\n", vo_panscan); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_adapter_num:%d\n", vo_adapter_num); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_refresh_rate:%d\n", vo_refresh_rate); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_brightness:%d\n", vo_gamma_brightness); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_saturation:%d\n", vo_gamma_saturation); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_contrast:%d\n", vo_gamma_contrast); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_hue:%d\n", vo_gamma_hue); +/* mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_red_intensity:%d\n", vo_gamma_red_intensity); */ +/* mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_green_intensity:%d\n", vo_gamma_green_intensity); */ +/* mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_gamma_blue_intensity:%d\n", vo_gamma_blue_intensity); */ +/* mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_mouse_timer_const:%d\n", vo_mouse_timer_const); */ + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_nomouse_input:%d\n", vo_nomouse_input); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_pts:%d\n", vo_pts); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_fps:%f\n", vo_fps); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: vo_colorkey:%d\n", vo_colorkey); + mp_msg(MSGT_VO, MSGL_DBG2, "vo_w100: ================================\n"); +} diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h b/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h new file mode 100644 index 0000000000..59cf58be26 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h @@ -0,0 +1,306 @@ +/* -*- mode: c++; tab-width: 4 -*- */ + +/* $Id$ */ + +/* + * Copyright (C) 2003-2004 AGAWA Koji + * + * This program 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 program 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 program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/** + * @file w100api.h + * @brief + * + * + * + * @author AGAWA Koji + * @date $Date$ + * @version $Revision$ + */ + +#ifndef W100API_H_INCLUDED +#define W100API_H_INCLUDED + +#ifdef __cplusplus +# define EXTERN_C_BEGIN extern "C" { +# define EXTERN_C_END } +#else +# define EXTERN_C_BEGIN +# define EXTERN_C_END +#endif + +EXTERN_C_BEGIN + +#include + +typedef int8_t s8; +typedef int16_t s16; +typedef int32_t s32; +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; + +#include "vo_w100_fb.h" + +// DP_GUI_MASTER_CNTL.GMC_Dst_DataType +// DP_DATATYPE.Dp_Dst_DataType +/* #define DSTTYPE_8BPP 2 // 8 bpp grey scale */ +/* #define DSTTYPE_16BPP_1555 3 //16 bpp aRGB 1555 */ +/* #define DSTTYPE_16BPP_444 5 //16 bpp aRGB 4444 */ +#define DSTTYPE_8BPP 1 + +// DP_GUI_MASTER_CNTL.GMC_Src_DataType +// DP_DATATYPE.Dp_Src_DataType +#define SRCTYPE_1BPP_OPA 0 //mono (expanded to frgd, bkgd) +#define SRCTYPE_1BPP_TRA 1 //mono (expanded to frgd, leave_alone) +#define SRCTYPE_EQU_DST 3 //color (same as DST) +#define SRCTYPE_SOLID_COLOR_BLT 4 //solid color for Blt (use frgd) +#define SRCTYPE_4BPP 5 //4 bpp +#define SRCTYPE_12BPP_PACKED 6 //12 bpp packed + +#define ROP3_SRCCOPY 0xCC + +#define OVLTYPE_YUV420 0x07 + +#define INTERNAL_VRAM 0 +#define EXTERNAL_VRAM 1 + +#define VRAM_OFFSET_INTERNAL 0x00000000 +#define VRAM_OFFSET_EXTERNAL 0x0F000000 + +typedef struct { + /* 順序と型が未確定 */ + int16_t XCoord; + int16_t YCoord; +} ATI_POINT; + +typedef struct { + /* 順序と型が未確定 */ + int16_t XCoord; + int16_t YCoord; + int16_t Width; + int16_t Height; +} ATI_RECT; + +typedef struct { + /* 順序と型が未確定 */ + uint32_t Count; /* +0 */ + uint8_t ScaleXFactor; /* +4 確定 */ + uint8_t ScaleYFactor; /* +5 確定 */ + uint8_t BlendOn; /* +6 確定 */ + uint8_t dummy1; +} ATI_STRETCH; /* 8bytes? */ + +typedef struct { + uint32_t *lpSrcBitmap; + uint16_t XCoord; /* +4 確定 */ + uint16_t YCoord; /* +6 確定 */ + uint16_t SrcPitch; /* +8 確定 */ + uint16_t SrcHeight; /* +10 確定 */ + uint16_t OverlayWidth; + uint16_t OverlayHeight; + uint16_t *lpOverlayKey; /* +16 確定 */ + // uint16_t key[2] へのポインタ + uint8_t OverlayFormat; /* +20 確定 */ + uint8_t dummy1; + uint16_t dummy2; +} ATI_OVERLAYPROP; /* 24bytes? */ + +typedef struct { + int HInvert; + int VInvert; +} ATI_EXTVIDEOPROP; + +typedef struct { + ATI_EXTVIDEOPROP ExtVideoProp; +} ATI_UNKNOWN1; + +typedef struct { + ATI_UNKNOWN1 u1; // こっち？ + uint8_t HExpansion; /* +8 確定 */ + uint8_t VExpansion; /* +9 確定 */ + uint8_t RConversion; /* +12 確定 */ +/* ATI_UNKNOWN1 x; */ +} ATI_EXTENDEDOVERLAYPROP; /* 16byte? */ + +/** + * アクセラレーションの利用を開始する。 + * + * @return 1:success, 0:fail + */ +int AtiCore_ProcessAttach(void); +int AtiCore_ProcessAttachSpecialMode(uint32_t); + +/** + * アクセラレーションの利用を終了する。 + * + * @return *不明* + */ +int AtiCore_ProcessDetach(void); + +/** + * サーフェスをビデオメモリ上に作成する。 + * + * @arg handle (返値)サーフェスのハンドル + * @arg offset (返値)サーフェスのオフセット + * @arg size サーフェスのサイズ + * @arg direction (0:低位から高位へ, 1:高位から低位へ)向かって確保 + * @return 1:success, 0:fail + */ +int AtiCore_AllocateSurface(uint16_t *handle, uint32_t *offset, + uint32_t size, uint32_t direction); + +/** + * サーフェスを破棄する。 + * + * @arg handle サーフェスのハンドル + * @return 1:success, 0:fail + */ +int AtiCore_DestroySurface(uint16_t handle); + +/*8 + * @param rop 8ビットのフラグと思われる + */ +int AtiCore_SetRopOperation(uint32_t rop); + +int AtiCore_SetDstType(uint32_t); +int AtiCore_SetSrcType(uint32_t); +int AtiCore_SetSrcClippingRect(ATI_CLIPRECT *cliprect); +int AtiCore_SetDstClippingRect(ATI_CLIPRECT *cliprect); +int AtiCore_SetSrcPitchOffset(int pitch, int offset); +int AtiCore_SetDstPitchOffset(int pitch, int offset); + +int AtiCore_BitBltFilpRotate(int blt090Rotate, + ATI_RECT *dstRect, ATI_RECT *srcRect); +int AtiCore_StretchBlt(ATI_STRETCH *option, + ATI_POINT *point, ATI_RECT *srcRect); + + +/** + * (BitBltなどの)処理が完了するのを待つ。 + * + * @param nsec ウェイト時間(msec) + * @return 1:処理が完了した, 0:処理はまだ終わっていない + */ +int AtiCore_WaitComplete(int msec); + +/** + * オーバレイを作成する。 + * + * @param handle (返値)オーバレイのハンドル + * @return 1:success, 0:fail + */ +int AtiCore_AllocOverlay(uint16_t *handle); + +int AtiCore_ReleaseOverlay(uint16_t handle); + +/** + * @return 1:success, 0:fail + */ +int AtiCore_SetupOverlay(uint16_t handle, ATI_OVERLAYPROP *prop); + +int AtiCore_SetupOverlayExtended(uint16_t handle, ATI_EXTENDEDOVERLAYPROP *prop); + +/** + * @return 1:success, 0:fail + */ +int AtiCore_SetOverlayOnOff(uint16_t handle, int isEnable); + +int AtiCore_SetOverlayPos(uint16_t handle, uint16_t x, uint16_t y); + +int AtiCore_SetupMemoryTransfer(uint32_t offset, void **regdata); +int AtiCore_TerminateMemoryTransfer(void); + +int AtiCore_GetFrontBufferPitchOffset(uint32_t *pitch, uint32_t *offset); + +/** + * @return 1:success, 0:fail + */ +int AtiCore_SetDisplayBrightness(int brightness); + +/** + * @return 1:success, 0:fail + */ +int GetAvailableVideoMem(uint32_t *internal, uint32_t *external); + +/* + * 1 ; 0 + */ +int AtiCore_SetGraphicWindowOnOff(int ); + +int AtiCore_ReadReg(uint32_t reg, void *val); +int AtiCore_WriteReg(uint32_t reg, void *val); + +uint32_t GetRealMemAddr(uint32_t offset); + +int AtiCore_SetBkgColour(uint32_t); + +/* ================================================================ */ +/* from libqte.so.2.3.2 */ +/* +AtiCore_AlphaBlend +AtiCore_BitBlt +AtiCore_BrushType +AtiCore_CursorOnOff +AtiCore_DrawPixel +AtiCore_Flush +AtiCore_GammaCorrection +AtiCore_GetCRC +AtiCore_GetCursorPos +AtiCore_GetDeviceInfo +AtiCore_GetGPIO_Data +AtiCore_GetGraphicExtended +AtiCore_GetGraphicWindowPos +AtiCore_GetLargestVideoMemBlock +AtiCore_GetLastError +AtiCore_GetMultiCRC +AtiCore_GetOverlayPos +AtiCore_GetPitchOffsetProperty +AtiCore_Host +AtiCore_LoadCursorBitMap +AtiCore_PaintRect +AtiCore_PolyScanline +AtiCore_Polyline +AtiCore_ProcessAttachMinimal +AtiCore_ProcessAttachSpecialMode +AtiCore_ProcessDetachMinimal +AtiCore_ProcessDetachSpecialMode +AtiCore_ReadCfgReg +AtiCore_ScanlineShading +AtiCore_SetApertures +AtiCore_SetBkgColour +AtiCore_SetBytePixelOrder +AtiCore_SetCursorPos +AtiCore_SetDisplayParameters +AtiCore_SetDriverBehaviour +AtiCore_SetFrgColour +AtiCore_SetFrontBuffer +AtiCore_SetGPIO_Data +AtiCore_SetGraphicWindowPos +AtiCore_SetOverlayPosUsingGraphicWindowXY +AtiCore_SetPartialCursor +AtiCore_SetupGraphicExtended +AtiCore_SetupGraphicWindow +AtiCore_SetupPM4 +AtiCore_SmallText +AtiCore_SubmitPM4Packet +AtiCore_TransBitBlt +AtiCore_WriteCfgReg + */ + +EXTERN_C_END + +#endif /* W100API_H_INCLUDED */ diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h b/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h new file mode 100644 index 0000000000..39318c645b --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h @@ -0,0 +1,4338 @@ +/* + * linux/drivers/video/w100fb.h + * + * Frame Buffer Device for ATI w100 (Wallaby) + * + * Copyright (C) 2002, ATI Corp. + * + * This program 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 program 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. + * + * ChangeLog: + * + */ + +#if !defined (_W100FB_H) +#define _W100FB_H + +/* Block CIF Start: */ +#define mmCHIP_ID 0x0000 +#define mmREVISION_ID 0x0004 +#define mmWRAP_BUF_A 0x0008 +#define mmWRAP_BUF_B 0x000C +#define mmWRAP_TOP_DIR 0x0010 +#define mmWRAP_START_DIR 0x0014 +#define mmCIF_CNTL 0x0018 +#define mmCFGREG_BASE 0x001C +#define mmCIF_IO 0x0020 +#define mmCIF_READ_DBG 0x0024 +#define mmCIF_WRITE_DBG 0x0028 +#define cfgIND_ADDR_A_0 0x0000 +#define cfgIND_ADDR_A_1 0x0001 +#define cfgIND_ADDR_A_2 0x0002 +#define cfgIND_DATA_A 0x0003 +#define cfgREG_BASE 0x0004 +#define cfgINTF_CNTL 0x0005 +#define cfgSTATUS 0x0006 +#define cfgCPU_DEFAULTS 0x0007 +#define cfgIND_ADDR_B_0 0x0008 +#define cfgIND_ADDR_B_1 0x0009 +#define cfgIND_ADDR_B_2 0x000A +#define cfgIND_DATA_B 0x000B +#define cfgPM4_RPTR 0x000C +#define cfgSCRATCH 0x000D +#define cfgPM4_WRPTR_0 0x000E +#define cfgPM4_WRPTR_1 0x000F +/* Block CIF End: */ + +/* Block CP Start: */ +#define mmCP_RB_CNTL 0x0210 +#define mmCP_RB_BASE 0x0214 +#define mmCP_RB_RPTR_ADDR 0x0218 +#define mmCP_RB_RPTR 0x021C +#define mmCP_RB_RPTR_WR 0x02F8 +#define mmCP_RB_WPTR 0x0220 +#define mmCP_IB_BASE 0x0228 +#define mmCP_IB_BUFSZ 0x022C +#define mmCP_CSQ_CNTL 0x0230 +#define mmCP_CSQ_APER_PRIMARY 0x0300 +#define mmCP_CSQ_APER_INDIRECT 0x0340 +#define mmCP_ME_CNTL 0x0240 +#define mmCP_ME_RAM_ADDR 0x0244 +#define mmCP_ME_RAM_RADDR 0x0248 +#define mmCP_ME_RAM_DATAH 0x024C +#define mmCP_ME_RAM_DATAL 0x0250 +#define mmCP_DEBUG 0x025C +#define mmSCRATCH_REG0 0x0260 +#define mmSCRATCH_REG1 0x0264 +#define mmSCRATCH_REG2 0x0268 +#define mmSCRATCH_REG3 0x026C +#define mmSCRATCH_REG4 0x0270 +#define mmSCRATCH_REG5 0x0274 +#define mmSCRATCH_UMSK 0x0280 +#define mmSCRATCH_ADDR 0x0284 +#define mmCP_CSQ_ADDR 0x02E4 +#define mmCP_CSQ_DATA 0x02E8 +#define mmCP_CSQ_STAT 0x02EC +#define mmCP_STAT 0x02F0 +#define mmGEN_INT_CNTL 0x0200 +#define mmGEN_INT_STATUS 0x0204 +/* Block CP End: */ + +/* Block DISPLAY Start: */ +#define mmLCD_FORMAT 0x0410 +#define mmGRAPHIC_CTRL 0x0414 +#define mmGRAPHIC_OFFSET 0x0418 +#define mmGRAPHIC_PITCH 0x041C +#define mmCRTC_TOTAL 0x0420 +#define mmACTIVE_H_DISP 0x0424 +#define mmACTIVE_V_DISP 0x0428 +#define mmGRAPHIC_H_DISP 0x042C +#define mmGRAPHIC_V_DISP 0x0430 +#define mmVIDEO_CTRL 0x0434 +#define mmGRAPHIC_KEY 0x0438 +#define mmVIDEO_Y_OFFSET 0x043C +#define mmVIDEO_Y_PITCH 0x0440 +#define mmVIDEO_U_OFFSET 0x0444 +#define mmVIDEO_U_PITCH 0x0448 +#define mmVIDEO_V_OFFSET 0x044C +#define mmVIDEO_V_PITCH 0x0450 +#define mmVIDEO_H_POS 0x0454 +#define mmVIDEO_V_POS 0x0458 +#define mmBRIGHTNESS_CNTL 0x045C +#define mmCURSOR1_OFFSET 0x0460 +#define mmCURSOR1_H_POS 0x0464 +#define mmCURSOR1_V_POS 0x0468 +#define mmCURSOR1_COLOR0 0x046C +#define mmCURSOR1_COLOR1 0x0470 +#define mmCURSOR2_OFFSET 0x0474 +#define mmCURSOR2_H_POS 0x0478 +#define mmCURSOR2_V_POS 0x047C +#define mmCURSOR2_COLOR0 0x0480 +#define mmCURSOR2_COLOR1 0x0484 +#define mmDISP_INT_CNTL 0x0488 +#define mmCRTC_SS 0x048C +#define mmCRTC_LS 0x0490 +#define mmCRTC_REV 0x0494 +#define mmCRTC_DCLK 0x049C +#define mmCRTC_GS 0x04A0 +#define mmCRTC_VPOS_GS 0x04A4 +#define mmCRTC_GCLK 0x04A8 +#define mmCRTC_GOE 0x04AC +#define mmCRTC_FRAME 0x04B0 +#define mmCRTC_FRAME_VPOS 0x04B4 +#define mmGPIO_DATA 0x04B8 +#define mmGPIO_CNTL1 0x04BC +#define mmGPIO_CNTL2 0x04C0 +#define mmLCDD_CNTL1 0x04C4 +#define mmLCDD_CNTL2 0x04C8 +#define mmGENLCD_CNTL1 0x04CC +#define mmGENLCD_CNTL2 0x04D0 +#define mmDISP_DEBUG 0x04D4 +#define mmDISP_DB_BUF_CNTL 0x04D8 +#define mmDISP_CRC_SIG 0x04DC +#define mmCRTC_DEFAULT_COUNT 0x04E0 +#define mmLCD_BACKGROUND_COLOR 0x04E4 +#define mmCRTC_PS2 0x04E8 +#define mmCRTC_PS2_VPOS 0x04EC +#define mmCRTC_PS1_ACTIVE 0x04F0 +#define mmCRTC_PS1_NACTIVE 0x04F4 +#define mmCRTC_GCLK_EXT 0x04F8 +#define mmCRTC_ALW 0x04FC +#define mmCRTC_ALW_VPOS 0x0500 +#define mmCRTC_PSK 0x0504 +#define mmCRTC_PSK_HPOS 0x0508 +#define mmCRTC_CV4_START 0x050C +#define mmCRTC_CV4_END 0x0510 +#define mmCRTC_CV4_HPOS 0x0514 +#define mmCRTC_ECK 0x051C +#define mmREFRESH_CNTL 0x0520 +#define mmGENLCD_CNTL3 0x0524 +#define mmGPIO_DATA2 0x0528 +#define mmGPIO_CNTL3 0x052C +#define mmGPIO_CNTL4 0x0530 +#define mmCHIP_STRAP 0x0534 +#define mmDISP_DEBUG2 0x0538 +#define mmDEBUG_BUS_CNTL 0x053C +#define mmGAMMA_VALUE1 0x0540 +#define mmGAMMA_VALUE2 0x0544 +#define mmGAMMA_SLOPE 0x0548 +#define mmGEN_STATUS 0x054C +#define mmHW_INT 0x0550 +/* Block DISPLAY End: */ + +/* Block GFX Start: */ +#define mmDST_OFFSET 0x1004 +#define mmDST_PITCH 0x1008 +#define mmDST_PITCH_OFFSET 0x102C +#define mmDST_X 0x101C +#define mmDST_Y 0x1020 +#define mmDST_X_Y 0x1194 +#define mmDST_Y_X 0x1038 +#define mmDST_WIDTH 0x100C +#define mmDST_HEIGHT 0x1010 +#define mmDST_WIDTH_HEIGHT 0x1198 +#define mmDST_HEIGHT_WIDTH 0x103C +#define mmDST_HEIGHT_WIDTH_8 0x118C +#define mmDST_HEIGHT_Y 0x11A0 +#define mmDST_WIDTH_X 0x1188 +#define mmDST_WIDTH_X_INCY 0x119C +#define mmDST_LINE_START 0x1090 +#define mmDST_LINE_END 0x1094 +#define mmBRUSH_OFFSET 0x108C +#define mmBRUSH_Y_X 0x1074 +#define mmDP_BRUSH_FRGD_CLR 0x107C +#define mmDP_BRUSH_BKGD_CLR 0x1078 +#define mmSRC2_OFFSET 0x1060 +#define mmSRC2_PITCH 0x1064 +#define mmSRC2_PITCH_OFFSET 0x1068 +#define mmSRC2_X 0x1050 +#define mmSRC2_Y 0x1054 +#define mmSRC2_X_Y 0x1058 +#define mmSRC2_WIDTH 0x1080 +#define mmSRC2_HEIGHT 0x1084 +#define mmSRC2_INC 0x1088 +#define mmSRC_OFFSET 0x11AC +#define mmSRC_PITCH 0x11B0 +#define mmSRC_PITCH_OFFSET 0x1028 +#define mmSRC_X 0x1014 +#define mmSRC_Y 0x1018 +#define mmSRC_X_Y 0x1190 +#define mmSRC_Y_X 0x1034 +#define mmSRC_WIDTH 0x1040 +#define mmSRC_HEIGHT 0x1044 +#define mmSRC_INC 0x1048 +#define mmHOST_DATA0 0x13C0 +#define mmHOST_DATA1 0x13C4 +#define mmHOST_DATA2 0x13C8 +#define mmHOST_DATA3 0x13CC +#define mmHOST_DATA4 0x13D0 +#define mmHOST_DATA5 0x13D4 +#define mmHOST_DATA6 0x13D8 +#define mmHOST_DATA7 0x13DC +#define mmHOST_DATA_LAST 0x13E0 +#define mmDP_SRC_FRGD_CLR 0x1240 +#define mmDP_SRC_BKGD_CLR 0x1244 +#define mmSC_LEFT 0x1140 +#define mmSC_RIGHT 0x1144 +#define mmSC_TOP 0x1148 +#define mmSC_BOTTOM 0x114C +#define mmSRC_SC_RIGHT 0x1154 +#define mmSRC_SC_BOTTOM 0x115C +#define mmDP_CNTL 0x11C8 +#define mmDP_CNTL_DST_DIR 0x11CC +#define mmDP_DATATYPE 0x12C4 +#define mmDP_MIX 0x12C8 +#define mmDP_WRITE_MSK 0x12CC +#define mmCLR_CMP_CLR_SRC 0x1234 +#define mmCLR_CMP_CLR_DST 0x1238 +#define mmCLR_CMP_CNTL 0x1230 +#define mmCLR_CMP_MSK 0x123C +#define mmDEFAULT_PITCH_OFFSET 0x10A0 +#define mmDEFAULT_SC_BOTTOM_RIGHT 0x10A8 +#define mmDEFAULT2_SC_BOTTOM_RIGHT 0x10AC +#define mmREF1_PITCH_OFFSET 0x10B8 +#define mmREF2_PITCH_OFFSET 0x10BC +#define mmREF3_PITCH_OFFSET 0x10C0 +#define mmREF4_PITCH_OFFSET 0x10C4 +#define mmREF5_PITCH_OFFSET 0x10C8 +#define mmREF6_PITCH_OFFSET 0x10CC +#define mmDP_GUI_MASTER_CNTL 0x106C +#define mmSC_TOP_LEFT 0x11BC +#define mmSC_BOTTOM_RIGHT 0x11C0 +#define mmSRC_SC_BOTTOM_RIGHT 0x11C4 +#define mmGLOBAL_ALPHA 0x1210 +#define mmFILTER_COEF 0x1214 +#define mmMVC_CNTL_START 0x11E0 +#define mmE2_ARITHMETIC_CNTL 0x1220 +#define mmDEBUG0 0x1280 +#define mmDEBUG1 0x1284 +#define mmDEBUG2 0x1288 +#define mmDEBUG3 0x128C +#define mmDEBUG4 0x1290 +#define mmDEBUG5 0x1294 +#define mmDEBUG6 0x1298 +#define mmDEBUG7 0x129C +#define mmDEBUG8 0x12A0 +#define mmDEBUG9 0x12A4 +#define mmDEBUG10 0x12A8 +#define mmDEBUG11 0x12AC +#define mmDEBUG12 0x12B0 +#define mmDEBUG13 0x12B4 +#define mmDEBUG14 0x12B8 +#define mmDEBUG15 0x12BC +#define mmENG_CNTL 0x13E8 +#define mmENG_PERF_CNT 0x13F0 +/* Block GFX End: */ + +/* Block IDCT Start: */ +#define mmIDCT_RUNS 0x0C00 +#define mmIDCT_LEVELS 0x0C04 +#define mmIDCT_CONTROL 0x0C3C +#define mmIDCT_AUTH_CONTROL 0x0C08 +#define mmIDCT_AUTH 0x0C0C +/* Block IDCT End: */ + +/* Block MC Start: */ +#define mmMEM_CNTL 0x0180 +#define mmMEM_ARB 0x0184 +#define mmMC_FB_LOCATION 0x0188 +#define mmMEM_EXT_CNTL 0x018C +#define mmMC_EXT_MEM_LOCATION 0x0190 +#define mmMEM_EXT_TIMING_CNTL 0x0194 +#define mmMEM_SDRAM_MODE_REG 0x0198 +#define mmMEM_IO_CNTL 0x019C +#define mmMC_DEBUG 0x01A0 +#define mmMC_BIST_CTRL 0x01A4 +#define mmMC_BIST_COLLAR_READ 0x01A8 +#define mmTC_MISMATCH 0x01AC +#define mmMC_PERF_MON_CNTL 0x01B0 +#define mmMC_PERF_COUNTERS 0x01B4 +/* Block MC End: */ + +/* Block RBBM Start: */ +#define mmWAIT_UNTIL 0x1400 +#define mmISYNC_CNTL 0x1404 +#define mmRBBM_GUICNTL 0x1408 +#define mmRBBM_STATUS 0x0140 +#define mmRBBM_STATUS_alt_1 0x140C +#define mmRBBM_CNTL 0x0144 +#define mmRBBM_SOFT_RESET 0x0148 +#define mmNQWAIT_UNTIL 0x0150 +#define mmRBBM_DEBUG 0x016C +#define mmRBBM_CMDFIFO_ADDR 0x0170 +#define mmRBBM_CMDFIFO_DATAL 0x0174 +#define mmRBBM_CMDFIFO_DATAH 0x0178 +#define mmRBBM_CMDFIFO_STAT 0x017C +/* Block RBBM End: */ + +/* Block CG Start: */ +#define mmCLK_PIN_CNTL 0x0080 +#define mmPLL_REF_FB_DIV 0x0084 +#define mmPLL_CNTL 0x0088 +#define mmSCLK_CNTL 0x008C +#define mmPCLK_CNTL 0x0090 +#define mmCLK_TEST_CNTL 0x0094 +#define mmPWRMGT_CNTL 0x0098 +#define mmPWRMGT_STATUS 0x009C +/* Block CG End: */ + +/* default value definitions */ +#define defCHIP_ID 0x00001002 +#define defREVISION_ID 0x00000000 +#define defWRAP_BUF_A 0x01000000 +#define defWRAP_BUF_B 0x01000000 +#define defWRAP_TOP_DIR 0x00000000 +#define defWRAP_START_DIR 0x00000000 +//#define defCIF_CNTL 0x00082900 +#define defCIF_CNTL 0x00182d00 //??updated by Tobey Z.for Sharp,Oct11,2002 +#define defCFGREG_BASE 0x00000000 +//#define defCIF_IO 0x000c0800 +#define defCIF_IO 0x000C0902 //??updated by Tobey Z.for Sharp,Oct11,2002 +#define defCIF_READ_DBG 0x00018223 +#define defCIF_WRITE_DBG 0x00002100 +#define defIND_ADDR_A_0 0x00000000 +#define defIND_ADDR_A_1 0x00000000 +#define defIND_ADDR_A_2 0x00000000 +#define defIND_DATA_A 0x00000000 +#define defREG_BASE 0x00000001 +#define defINTF_CNTL 0x00000011 +#define defSTATUS 0x00000000 +#define defCPU_DEFAULTS 0x00000006 +#define defIND_ADDR_B_0 0x00000000 +#define defIND_ADDR_B_1 0x00000000 +#define defIND_ADDR_B_2 0x00000000 +#define defIND_DATA_B 0x00000000 +#define defPM4_RPTR 0x00000000 +#define defSCRATCH 0x00000000 +#define defPM4_WRPTR_0 0x00000000 +#define defPM4_WRPTR_1 0x00000000 +#define defCP_RB_CNTL 0x00000000 +#define defCP_RB_BASE 0x00000000 +#define defCP_RB_RPTR_ADDR 0x00000000 +#define defCP_RB_RPTR 0x00000000 +#define defCP_RB_RPTR_WR 0x00000000 +#define defCP_RB_WPTR 0x00000000 +#define defCP_IB_BASE 0x00000000 +#define defCP_IB_BUFSZ 0x00000000 +#define defCP_CSQ_CNTL 0x00000000 +#define defCP_CSQ_APER_PRIMARY 0x00000000 +#define defCP_CSQ_APER_INDIRECT 0x00000000 +#define defCP_ME_CNTL 0x40000000 +#define defCP_ME_RAM_ADDR 0x00000000 +#define defCP_ME_RAM_RADDR 0x00000000 +#define defCP_ME_RAM_DATAH 0x00000000 +#define defCP_ME_RAM_DATAL 0x00000000 +#define defCP_DEBUG 0x00000000 +#define defSCRATCH_REG0 0x00000000 +#define defSCRATCH_REG1 0x00000000 +#define defSCRATCH_REG2 0x00000000 +#define defSCRATCH_REG3 0x00000000 +#define defSCRATCH_REG4 0x00000000 +#define defSCRATCH_REG5 0x00000000 +#define defSCRATCH_UMSK 0x00000000 +#define defSCRATCH_ADDR 0x00000000 +#define defCP_CSQ_ADDR 0x00000000 +#define defCP_CSQ_DATA 0x00000000 +#define defCP_CSQ_STAT 0x00000000 +#define defCP_STAT 0x00000000 +#define defGEN_INT_CNTL 0x00000000 +#define defGEN_INT_STATUS_rd 0x00080000 +#define defGEN_INT_STATUS_wr 0x00000000 +#define defLCD_FORMAT 0x00000000 +#define defGRAPHIC_CTRL 0x00000000 +#define defGRAPHIC_OFFSET 0x00000000 +#define defGRAPHIC_PITCH 0x00000000 +#define defCRTC_TOTAL 0x00000000 +#define defACTIVE_H_DISP 0x00000000 +#define defACTIVE_V_DISP 0x00000000 +#define defGRAPHIC_H_DISP 0x00000000 +#define defGRAPHIC_V_DISP 0x00000000 +#define defVIDEO_CTRL 0x00000000 +#define defGRAPHIC_KEY 0x00000000 +#define defVIDEO_Y_OFFSET 0x00000000 +#define defVIDEO_Y_PITCH 0x00000000 +#define defVIDEO_U_OFFSET 0x00000000 +#define defVIDEO_U_PITCH 0x00000000 +#define defVIDEO_V_OFFSET 0x00000000 +#define defVIDEO_V_PITCH 0x00000000 +#define defVIDEO_H_POS 0x00000000 +#define defVIDEO_V_POS 0x00000000 +#define defBRIGHTNESS_CNTL 0x00000000 +#define defCURSOR1_OFFSET 0x00000000 +#define defCURSOR1_H_POS 0x00000000 +#define defCURSOR1_V_POS 0x00000000 +#define defCURSOR1_COLOR0 0x00000000 +#define defCURSOR1_COLOR1 0x00000000 +#define defCURSOR2_OFFSET 0x00000000 +#define defCURSOR2_H_POS 0x00000000 +#define defCURSOR2_V_POS 0x00000000 +#define defCURSOR2_COLOR0 0x00000000 +#define defCURSOR2_COLOR1 0x00000000 +#define defDISP_INT_CNTL 0x00000000 +#define defCRTC_SS 0x00000000 +#define defCRTC_LS 0x00000000 +#define defCRTC_REV 0x00000000 +#define defCRTC_DCLK 0x00000000 +#define defCRTC_GS 0x00000000 +#define defCRTC_VPOS_GS 0x00000000 +#define defCRTC_GCLK 0x00000000 +#define defCRTC_GOE 0x00000000 +#define defCRTC_FRAME 0x00000000 +#define defCRTC_FRAME_VPOS 0x00000000 +#define defGPIO_DATA 0x00000000 +#define defGPIO_CNTL1 0xff00ff00 +#define defGPIO_CNTL2 0x00000000 +#define defLCDD_CNTL1 0x0000ffff +#define defLCDD_CNTL2 0x00000000 +#define defGENLCD_CNTL1 0x00aaa002 +#define defGENLCD_CNTL2 0x00000002 +#define defDISP_DEBUG 0x00000000 +#define defDISP_DB_BUF_CNTL_rd 0x00000000 +#define defDISP_DB_BUF_CNTL_wr 0x00000000 +#define defDISP_CRC_SIG 0x00000000 +#define defCRTC_DEFAULT_COUNT 0x00000000 +#define defLCD_BACKGROUND_COLOR 0x00000000 +#define defCRTC_PS2 0x00000000 +#define defCRTC_PS2_VPOS 0x00000000 +#define defCRTC_PS1_ACTIVE 0x00000000 +#define defCRTC_PS1_NACTIVE 0x00000000 +#define defCRTC_GCLK_EXT 0x00000000 +#define defCRTC_ALW 0x00000000 +#define defCRTC_ALW_VPOS 0x00000000 +#define defCRTC_PSK 0x00000000 +#define defCRTC_PSK_HPOS 0x00000000 +#define defCRTC_CV4_START 0x00000000 +#define defCRTC_CV4_END 0x00000000 +#define defCRTC_CV4_HPOS 0x00000000 +#define defCRTC_ECK 0x00000000 +#define defREFRESH_CNTL 0x00000000 +#define defGENLCD_CNTL3 0x000002aa +#define defGPIO_DATA2 0x00000000 +#define defGPIO_CNTL3 0x00000000 +#define defGPIO_CNTL4 0x00000000 +#define defCHIP_STRAP 0x00000000 +#define defDISP_DEBUG2 0x00000000 +#define defDEBUG_BUS_CNTL 0x00000000 +#define defGAMMA_VALUE1 0x00000000 +#define defGAMMA_VALUE2 0x00000000 +#define defGAMMA_SLOPE 0x00000000 +#define defGEN_STATUS 0x00000000 +#define defHW_INT 0x00000000 +#define defDST_OFFSET 0x00000000 +#define defDST_PITCH 0x00000000 +#define defDST_PITCH_OFFSET 0x00000000 +#define defDST_X 0x00000000 +#define defDST_Y 0x00000000 +#define defDST_X_Y 0x00000000 +#define defDST_Y_X 0x00000000 +#define defDST_WIDTH 0x00000000 +#define defDST_HEIGHT 0x00000000 +#define defDST_WIDTH_HEIGHT 0x00000000 +#define defDST_HEIGHT_WIDTH 0x00000000 +#define defDST_HEIGHT_WIDTH_8 0x00000000 +#define defDST_HEIGHT_Y 0x00000000 +#define defDST_WIDTH_X 0x00000000 +#define defDST_WIDTH_X_INCY 0x00000000 +#define defDST_LINE_START 0x00000000 +#define defDST_LINE_END 0x00000000 +#define defBRUSH_OFFSET 0x00000000 +#define defBRUSH_Y_X 0x00000000 +#define defDP_BRUSH_FRGD_CLR 0x00000000 +#define defDP_BRUSH_BKGD_CLR 0x00000000 +#define defSRC2_OFFSET 0x00000000 +#define defSRC2_PITCH 0x00000000 +#define defSRC2_PITCH_OFFSET 0x00000000 +#define defSRC2_X 0x00000000 +#define defSRC2_Y 0x00000000 +#define defSRC2_X_Y 0x00000000 +#define defSRC2_WIDTH 0x00000000 +#define defSRC2_HEIGHT 0x00000000 +#define defSRC2_INC 0x00000000 +#define defSRC_OFFSET 0x00000000 +#define defSRC_PITCH 0x00000000 +#define defSRC_PITCH_OFFSET 0x00000000 +#define defSRC_X 0x00000000 +#define defSRC_Y 0x00000000 +#define defSRC_X_Y 0x00000000 +#define defSRC_Y_X 0x00000000 +#define defSRC_WIDTH 0x00000000 +#define defSRC_HEIGHT 0x00000000 +#define defSRC_INC 0x00000000 +#define defHOST_DATA0 0x00000000 +#define defHOST_DATA1 0x00000000 +#define defHOST_DATA2 0x00000000 +#define defHOST_DATA3 0x00000000 +#define defHOST_DATA4 0x00000000 +#define defHOST_DATA5 0x00000000 +#define defHOST_DATA6 0x00000000 +#define defHOST_DATA7 0x00000000 +#define defHOST_DATA_LAST 0x00000000 +#define defDP_SRC_FRGD_CLR 0x00000000 +#define defDP_SRC_BKGD_CLR 0x00000000 +#define defSC_LEFT 0x00000000 +#define defSC_RIGHT 0x00000000 +#define defSC_TOP 0x00000000 +#define defSC_BOTTOM 0x00000000 +#define defSRC_SC_RIGHT 0x00000000 +#define defSRC_SC_BOTTOM 0x00000000 +#define defDP_CNTL 0x00000000 +#define defDP_CNTL_DST_DIR 0x00000000 +#define defDP_DATATYPE 0x00000000 +#define defDP_MIX 0x00000000 +#define defDP_WRITE_MSK 0x00000000 +#define defCLR_CMP_CLR_SRC 0x00000000 +#define defCLR_CMP_CLR_DST 0x00000000 +#define defCLR_CMP_CNTL 0x00000000 +#define defCLR_CMP_MSK 0x00000000 +#define defDEFAULT_PITCH_OFFSET 0x00000000 +#define defDEFAULT_SC_BOTTOM_RIGHT 0x00000000 +#define defDEFAULT2_SC_BOTTOM_RIGHT 0x00000000 +#define defREF1_PITCH_OFFSET 0x00000000 +#define defREF2_PITCH_OFFSET 0x00000000 +#define defREF3_PITCH_OFFSET 0x00000000 +#define defREF4_PITCH_OFFSET 0x00000000 +#define defREF5_PITCH_OFFSET 0x00000000 +#define defREF6_PITCH_OFFSET 0x00000000 +#define defDP_GUI_MASTER_CNTL 0x00000000 +#define defSC_TOP_LEFT 0x00000000 +#define defSC_BOTTOM_RIGHT 0x00000000 +#define defSRC_SC_BOTTOM_RIGHT 0x00000000 +#define defGLOBAL_ALPHA 0x00000000 +#define defFILTER_COEF 0x00000000 +#define defMVC_CNTL_START 0x00000000 +#define defE2_ARITHMETIC_CNTL 0x00000000 +#define defDEBUG0 0x00000000 +#define defDEBUG1 0x00000000 +#define defDEBUG2 0x00000000 +#define defDEBUG3 0x00000000 +#define defDEBUG4 0x00000000 +#define defDEBUG5 0x00000000 +#define defDEBUG6 0x00000000 +#define defDEBUG7 0x00000000 +#define defDEBUG8 0x00000000 +#define defDEBUG9 0x00000000 +#define defDEBUG10 0x00000000 +#define defDEBUG11 0x00000000 +#define defDEBUG12 0x00000000 +#define defDEBUG13 0x00000000 +#define defDEBUG14 0x00000000 +#define defDEBUG15 0x00000000 +#define defENG_CNTL 0x00000003 +#define defENG_PERF_CNT 0x00000000 +#define defIDCT_RUNS 0x00000000 +#define defIDCT_LEVELS 0x00000000 +#define defIDCT_CONTROL 0x00000000 +#define defIDCT_AUTH_CONTROL 0x00000000 +#define defIDCT_AUTH 0x00000000 +#define defMEM_CNTL 0x00000006 +#define defMEM_ARB 0x00000000 +#define defMC_FB_LOCATION 0x00ff0000 +#define defMEM_EXT_CNTL 0x00040010 +#define defMC_EXT_MEM_LOCATION 0x07ff0000 +#define defMEM_EXT_TIMING_CNTL 0x00140c73 +#define defMEM_SDRAM_MODE_REG 0x00050000 +#define defMEM_IO_CNTL 0x00ff00ff +#define defMC_DEBUG 0x00000000 +#define defMC_BIST_CTRL 0x00000000 +#define defMC_BIST_COLLAR_READ 0x00000000 +#define defTC_MISMATCH 0x00000000 +#define defMC_PERF_MON_CNTL 0x00000000 +#define defMC_PERF_COUNTERS 0x00000000 +#define defWAIT_UNTIL 0xc5cdcdcd +#define defISYNC_CNTL 0x00000000 +#define defRBBM_GUICNTL 0x00000000 +#define defRBBM_STATUS 0x81cdcd40 +#define defRBBM_CNTL 0x0000000f +#define defRBBM_SOFT_RESET 0x00000000 +#define defNQWAIT_UNTIL 0x00000001 +#define defRBBM_DEBUG 0x00000000 +#define defRBBM_CMDFIFO_ADDR 0x0000000d +#define defRBBM_CMDFIFO_DATAL 0xcdcdcdcd +#define defRBBM_CMDFIFO_DATAH 0x00000dcd +#define defRBBM_CMDFIFO_STAT 0x00000d0d +#define defCLK_PIN_CNTL 0x0000003f +#define defPLL_REF_FB_DIV 0x5a500000 +#define defPLL_CNTL 0x4b000203 +#define defSCLK_CNTL 0x00ff0300 +#define defPCLK_CNTL 0x00010000 +#define defCLK_TEST_CNTL 0x00000000 +#define defPWRMGT_CNTL 0x00000004 +#define defPWRMGT_STATUS 0x00000001 + +#define CFG_BASE_BOOT_DEFAULT 0x0 +#define CFG_BASE_VALUE 0x0 +#define REG_BASE_BOOT_DEFAULT 0x01 +#define REG_BASE_VALUE 0x10000 +#define MEM_INT_BASE_VALUE 0x100000 +#define MEM_INT_TOP_VALUE_W100 0x15ffff +#define MEM_EXT_BASE_VALUE 0x800000 +#define MEM_EXT_TOP_VALUE 0x9fffff +#define WRAP_BUF_BASE_VALUE 0x80000 +#define WRAP_BUF_TOP_VALUE 0xbffff + +//---------------------------------------------------------------------------- +// Registers Field Definitions + +// DP_GUI_MASTER_CNTL.GMC_Brush_DataType +// DP_DATATYPE.Brush_DataType +#define DP_BRUSH_8x8MONOOPA 0 //8x8 mono pattern (expanded to frgd, bkgd) +#define DP_BRUSH_8x8MONOTRA 1 //8x8 mono pattern (expanded to frgd, leave_alone) +#define DP_PEN_32x1MONOOPA 6 //32x1 mono pattern (expanded to frgd, bkgd) +#define DP_PEN_32x1MONOTRA 7 //32x1 mono pattern (expanded to frgd, leave_alone) +#define DP_BRUSH_8x8COLOR 10 //8x8 color pattern +#define DP_BRUSH_SOLIDCOLOR 13 //solid color pattern (frgd) +#define DP_BRUSH_NONE 15 //no brush used + +#define SIZE_BRUSH_8x8MONO 2 +#define SIZE_PEN_32x1MONO 1 +#define SIZE_BRUSH_8x8COLOR_8 16 +#define SIZE_BRUSH_8x8COLOR_16 32 +#define MAX_BRUSH_SIZE SIZE_BRUSH_8x8COLOR_16 + +// DP_GUI_MASTER_CNTL.GMC_Dst_DataType +// DP_DATATYPE.Dp_Dst_DataType +#define DP_DST_8BPP 2 // 8 bpp grey scale +#define DP_DST_16BPP_1555 3 //16 bpp aRGB 1555 +#define DP_DST_16BPP_444 5 //16 bpp aRGB 4444 + +// DP_GUI_MASTER_CNTL.GMC_Src_DataType +// DP_DATATYPE.Dp_Src_DataType +#define DP_SRC_1BPP_OPA 0 //mono (expanded to frgd, bkgd) +#define DP_SRC_1BPP_TRA 1 //mono (expanded to frgd, leave_alone) +#define DP_SRC_COLOR_SAME_AS_DST 3 //color (same as DST) +#define DP_SRC_SOLID_COLOR_BLT 4 //solid color for Blt (use frgd) +#define DP_SRC_4BPP 5 //4 bpp +#define DP_SRC_12BPP_PACKED 6 //12 bpp packed + +// DP_GUI_MASTER_CNTL.GMC_Byte_Pix_Order +// DP_DATATYPE.Dp_Byte_Pix_Order +#define DP_PIX_ORDER_MSB2LSB 0 //monochrome pixel order from MSBit to LSBit +#define DP_PIX_ORDER_LSB2MSB 1 //monochrome pixel order from LSBit to MSBit + +// DP_GUI_MASTER_CNTL.GMC_Dp_Src_Source +#define DP_SRC_MEM_LINEAR 1 //loaded from memory (linear trajectory) +#define DP_SRC_MEM_RECTANGULAR 2 //loaded from memory (rectangular trajectory) +#define DP_SRC_HOSTDATA_BIT 3 //loaded from hostdata (linear trajectory) +#define DP_SRC_HOSTDATA_BYTE 4 //loaded from hostdata (linear trajectory & byte-aligned) + +// DP_GUI_MASTER_CNTL.GMC_Dp_Op +#define DP_OP_ROP 0 +#define DP_OP_ARITHMETIC 1 + +// E2_ARITHMETIC_CNTL.opcode +#define E2_OPC_GLBALP_ADD_SRC2 0 +#define E2_OPC_GLBALP_SUB_SRC2 1 +#define E2_OPC_SRC1_ADD_SRC2 2 +#define E2_OPC_SRC1_SUB_SRC2 3 +#define E2_OPC_DST_SADDBLEND_SRC2 4 +#define E2_OPC_DST_CADDBLEND_SRC2 5 +#define E2_OPC_DST_CSUBBLEND_SRC2 6 +#define E2_OPC_LF_SRC2 7 +#define E2_OPC_SCALE_SRC2 8 +#define E2_OPC_STRETCH_SRC2 9 +#define E2_OPC_SRC1_4BPPCPYWEXP 10 +#define E2_OPC_MC1 11 +#define E2_OPC_MC2 12 +#define E2_OPC_MC1_IDCT 13 +#define E2_OPC_MC2_IDCT 14 +#define E2_OPC_IDCT_ONLY_IFRAME 15 + +// E2_ARITHMETIC_CNTL.clamp +#define E2_CLAMP_OFF 0 +#define E2_CLAMP_ON 1 + +// E2_ARITHMETIC_CNTL.rounding +#define E2_ROUNDING_TRUNCATE 0 +#define E2_ROUNDING_TO_INFINITY 1 + +// E2_ARITHMETIC_CNTL.srcblend +#define E2_SRCBLEND_GLOBALALPHA 0 +#define E2_SRCBLEND_ZERO 1 +#define E2_SRCBLEND_SRC2ALPHA 2 +#define E2_SRCBLEND_DSTALPHA 3 +#define E2_SRCBLEND_ALPHA1PLANE 4 + +// E2_ARITHMETIC_CNTL.destblend +#define E2_DSTBLEND_GLOBALALPHA 0 +#define E2_DSTBLEND_ZERO 1 +#define E2_DSTBLEND_SRC2ALPHA 2 +#define E2_DSTBLEND_DSTALPHA 3 +#define E2_DSTBLEND_ALPHA1PLANE 4 + +// LCD_FORMAT.lcd_type +#define LCDTYPE_TFT333 0 +#define LCDTYPE_TFT444 1 +#define LCDTYPE_TFT555 2 +#define LCDTYPE_TFT666 3 +#define LCDTYPE_COLSTNPACK4 4 +#define LCDTYPE_COLSTNPACK8F1 5 +#define LCDTYPE_COLSTNPACK8F2 6 +#define LCDTYPE_COLSTNPACK16 7 +#define LCDTYPE_MONSTNPACK4 8 +#define LCDTYPE_MONSTNPACK8 9 + +// CP_RB_CNTL.rb_bufsz +#define RB_SIZE_2K 8 +#define RB_SIZE_4K 9 +#define RB_SIZE_8K 10 +#define RB_SIZE_16K 11 +#define RB_SIZE_32K 12 +#define RB_SIZE_64K 13 + +// GRAPHIC_CTRL.color_depth +#define COLOR_DEPTH_1BPP 0 +#define COLOR_DEPTH_2BPP 1 +#define COLOR_DEPTH_4BPP 2 +#define COLOR_DEPTH_8BPP 3 +#define COLOR_DEPTH_332 4 +#define COLOR_DEPTH_A444 5 +#define COLOR_DEPTH_A555 6 + +// VIDEO_CTRL.video_mode +#define VIDEO_MODE_422 0 +#define VIDEO_MODE_420 1 + +/* data structure definitions */ + +typedef struct _chip_id_t { + unsigned long vendor_id : 16; + unsigned long device_id : 16; + } chip_id_t; + +typedef union { + unsigned long val : 32; + chip_id_t f; +} chip_id_u; + +typedef struct _revision_id_t { + unsigned long minor_rev_id : 4; + unsigned long major_rev_id : 4; + unsigned long : 24; + } revision_id_t; + +typedef union { + unsigned long val : 32; + revision_id_t f; +} revision_id_u; + +typedef struct _wrap_buf_a_t { + unsigned long offset_addr_a : 24; + unsigned long block_size_a : 3; + unsigned long : 5; + } wrap_buf_a_t; + +typedef union { + unsigned long val : 32; + wrap_buf_a_t f; +} wrap_buf_a_u; + +typedef struct _wrap_buf_b_t { + unsigned long offset_addr_b : 24; + unsigned long block_size_b : 3; + unsigned long : 5; + } wrap_buf_b_t; + +typedef union { + unsigned long val : 32; + wrap_buf_b_t f; +} wrap_buf_b_u; + +typedef struct _wrap_top_dir_t { + unsigned long top_addr : 23; + unsigned long : 9; + } wrap_top_dir_t; + +typedef union { + unsigned long val : 32; + wrap_top_dir_t f; +} wrap_top_dir_u; + +typedef struct _wrap_start_dir_t { + unsigned long start_addr : 23; + unsigned long : 9; + } wrap_start_dir_t; + +typedef union { + unsigned long val : 32; + wrap_start_dir_t f; +} wrap_start_dir_u; + +typedef struct _cif_cntl_t { + unsigned long swap_reg : 2; + unsigned long swap_fbuf_1 : 2; + unsigned long swap_fbuf_2 : 2; + unsigned long swap_fbuf_3 : 2; + unsigned long pmi_int_disable : 1; + unsigned long pmi_schmen_disable : 1; + unsigned long intb_oe : 1; + unsigned long en_wait_to_compensate_dq_prop_dly : 1; + unsigned long compensate_wait_rd_size : 2; + unsigned long wait_asserted_timeout_val : 2; + unsigned long wait_masked_val : 2; + unsigned long en_wait_timeout : 1; + unsigned long en_one_clk_setup_before_wait : 1; + unsigned long interrupt_active_high : 1; + unsigned long en_overwrite_straps : 1; + unsigned long strap_wait_active_hi : 1; + unsigned long lat_busy_count : 2; + unsigned long lat_rd_pm4_sclk_busy : 1; + unsigned long dis_system_bits : 1; + unsigned long dis_mr : 1; + unsigned long cif_spare_1 : 4; + } cif_cntl_t; + +typedef union { + unsigned long val : 32; + cif_cntl_t f; +} cif_cntl_u; + +typedef struct _cfgreg_base_t { + unsigned long cfgreg_base : 24; + unsigned long : 8; + } cfgreg_base_t; + +typedef union { + unsigned long val : 32; + cfgreg_base_t f; +} cfgreg_base_u; + +typedef struct _cif_io_t { + unsigned long dq_srp : 1; + unsigned long dq_srn : 1; + unsigned long dq_sp : 4; + unsigned long dq_sn : 4; + unsigned long waitb_srp : 1; + unsigned long waitb_srn : 1; + unsigned long waitb_sp : 4; + unsigned long waitb_sn : 4; + unsigned long intb_srp : 1; + unsigned long intb_srn : 1; + unsigned long intb_sp : 4; + unsigned long intb_sn : 4; + unsigned long : 2; + } cif_io_t; + +typedef union { + unsigned long val : 32; + cif_io_t f; +} cif_io_u; + +typedef struct _cif_read_dbg_t { + unsigned long unpacker_pre_fetch_trig_gen : 2; + unsigned long dly_second_rd_fetch_trig : 1; + unsigned long rst_rd_burst_id : 1; + unsigned long dis_rd_burst_id : 1; + unsigned long en_block_rd_when_packer_is_not_emp : 1; + unsigned long dis_pre_fetch_cntl_sm : 1; + unsigned long rbbm_chrncy_dis : 1; + unsigned long rbbm_rd_after_wr_lat : 2; + unsigned long dis_be_during_rd : 1; + unsigned long one_clk_invalidate_pulse : 1; + unsigned long dis_chnl_priority : 1; + unsigned long rst_read_path_a_pls : 1; + unsigned long rst_read_path_b_pls : 1; + unsigned long dis_reg_rd_fetch_trig : 1; + unsigned long dis_rd_fetch_trig_from_ind_addr : 1; + unsigned long dis_rd_same_byte_to_trig_fetch : 1; + unsigned long dis_dir_wrap : 1; + unsigned long dis_ring_buf_to_force_dec : 1; + unsigned long dis_addr_comp_in_16bit : 1; + unsigned long clr_w : 1; + unsigned long err_rd_tag_is_3 : 1; + unsigned long err_load_when_ful_a : 1; + unsigned long err_load_when_ful_b : 1; + unsigned long : 7; + } cif_read_dbg_t; + +typedef union { + unsigned long val : 32; + cif_read_dbg_t f; +} cif_read_dbg_u; + +typedef struct _cif_write_dbg_t { + unsigned long packer_timeout_count : 2; + unsigned long en_upper_load_cond : 1; + unsigned long en_chnl_change_cond : 1; + unsigned long dis_addr_comp_cond : 1; + unsigned long dis_load_same_byte_addr_cond : 1; + unsigned long dis_timeout_cond : 1; + unsigned long dis_timeout_during_rbbm : 1; + unsigned long dis_packer_ful_during_rbbm_timeout : 1; + unsigned long en_dword_split_to_rbbm : 1; + unsigned long en_dummy_val : 1; + unsigned long dummy_val_sel : 1; + unsigned long mask_pm4_wrptr_dec : 1; + unsigned long dis_mc_clean_cond : 1; + unsigned long err_two_reqi_during_ful : 1; + unsigned long err_reqi_during_idle_clk : 1; + unsigned long err_global : 1; + unsigned long en_wr_buf_dbg_load : 1; + unsigned long en_wr_buf_dbg_path : 1; + unsigned long sel_wr_buf_byte : 3; + unsigned long dis_rd_flush_wr : 1; + unsigned long dis_packer_ful_cond : 1; + unsigned long dis_invalidate_by_ops_chnl : 1; + unsigned long en_halt_when_reqi_err : 1; + unsigned long cif_spare_2 : 5; + unsigned long : 1; + } cif_write_dbg_t; + +typedef union { + unsigned long val : 32; + cif_write_dbg_t f; +} cif_write_dbg_u; + +typedef struct _ind_addr_a_0_t { + unsigned char ind_addr_a_0 : 8; + } ind_addr_a_0_t; + +typedef union { + unsigned char val : 8; + ind_addr_a_0_t f; +} ind_addr_a_0_u; + +typedef struct _ind_addr_a_1_t { + unsigned char ind_addr_a_1 : 8; + } ind_addr_a_1_t; + +typedef union { + unsigned char val : 8; + ind_addr_a_1_t f; +} ind_addr_a_1_u; + +typedef struct _ind_addr_a_2_t { + unsigned char ind_addr_a_2 : 8; + } ind_addr_a_2_t; + +typedef union { + unsigned char val : 8; + ind_addr_a_2_t f; +} ind_addr_a_2_u; + +typedef struct _ind_data_a_t { + unsigned char ind_data_a : 8; + } ind_data_a_t; + +typedef union { + unsigned char val : 8; + ind_data_a_t f; +} ind_data_a_u; + +typedef struct _reg_base_t { + unsigned char reg_base : 8; + } reg_base_t; + +typedef union { + unsigned char val : 8; + reg_base_t f; +} reg_base_u; + +typedef struct _intf_cntl_t { + unsigned char ad_inc_a : 1; + unsigned char ring_buf_a : 1; + unsigned char rd_fetch_trigger_a : 1; + unsigned char rd_data_rdy_a : 1; + unsigned char ad_inc_b : 1; + unsigned char ring_buf_b : 1; + unsigned char rd_fetch_trigger_b : 1; + unsigned char rd_data_rdy_b : 1; + } intf_cntl_t; + +typedef union { + unsigned char val : 8; + intf_cntl_t f; +} intf_cntl_u; + +typedef struct _status_t { + unsigned char wr_fifo_available_space : 2; + unsigned char fbuf_wr_pipe_emp : 1; + unsigned char soft_reset : 1; + unsigned char system_pwm_mode : 2; + unsigned char mem_access_dis : 1; + unsigned char en_pre_fetch : 1; + } status_t; + +typedef union { + unsigned char val : 8; + status_t f; +} status_u; + +typedef struct _cpu_defaults_t { + unsigned char unpack_rd_data : 1; + unsigned char access_ind_addr_a : 1; + unsigned char access_ind_addr_b : 1; + unsigned char access_scratch_reg : 1; + unsigned char pack_wr_data : 1; + unsigned char transition_size : 1; + unsigned char en_read_buf_mode : 1; + unsigned char rd_fetch_scratch : 1; + } cpu_defaults_t; + +typedef union { + unsigned char val : 8; + cpu_defaults_t f; +} cpu_defaults_u; + +typedef struct _ind_addr_b_0_t { + unsigned char ind_addr_b_0 : 8; + } ind_addr_b_0_t; + +typedef union { + unsigned char val : 8; + ind_addr_b_0_t f; +} ind_addr_b_0_u; + +typedef struct _ind_addr_b_1_t { + unsigned char ind_addr_b_1 : 8; + } ind_addr_b_1_t; + +typedef union { + unsigned char val : 8; + ind_addr_b_1_t f; +} ind_addr_b_1_u; + +typedef struct _ind_addr_b_2_t { + unsigned char ind_addr_b_2 : 8; + } ind_addr_b_2_t; + +typedef union { + unsigned char val : 8; + ind_addr_b_2_t f; +} ind_addr_b_2_u; + +typedef struct _ind_data_b_t { + unsigned char ind_data_b : 8; + } ind_data_b_t; + +typedef union { + unsigned char val : 8; + ind_data_b_t f; +} ind_data_b_u; + +typedef struct _pm4_rptr_t { + unsigned char pm4_rptr : 8; + } pm4_rptr_t; + +typedef union { + unsigned char val : 8; + pm4_rptr_t f; +} pm4_rptr_u; + +typedef struct _scratch_t { + unsigned char scratch : 8; + } scratch_t; + +typedef union { + unsigned char val : 8; + scratch_t f; +} scratch_u; + +typedef struct _pm4_wrptr_0_t { + unsigned char pm4_wrptr_0 : 8; + } pm4_wrptr_0_t; + +typedef union { + unsigned char val : 8; + pm4_wrptr_0_t f; +} pm4_wrptr_0_u; + +typedef struct _pm4_wrptr_1_t { + unsigned char pm4_wrptr_1 : 6; + unsigned char rd_fetch_pm4_rptr : 1; + unsigned char wrptr_atomic_update_w : 1; + } pm4_wrptr_1_t; + +typedef union { + unsigned char val : 8; + pm4_wrptr_1_t f; +} pm4_wrptr_1_u; + +typedef struct _cp_rb_cntl_t { + unsigned long rb_bufsz : 6; + unsigned long : 2; + unsigned long rb_blksz : 6; + unsigned long : 2; + unsigned long buf_swap : 2; + unsigned long max_fetch : 2; + unsigned long : 7; + unsigned long rb_no_update : 1; + unsigned long : 3; + unsigned long rb_rptr_wr_ena : 1; + } cp_rb_cntl_t; + +typedef union { + unsigned long val : 32; + cp_rb_cntl_t f; +} cp_rb_cntl_u; + +typedef struct _cp_rb_base_t { + unsigned long : 2; + unsigned long rb_base : 22; + unsigned long : 8; + } cp_rb_base_t; + +typedef union { + unsigned long val : 32; + cp_rb_base_t f; +} cp_rb_base_u; + +typedef struct _cp_rb_rptr_addr_t { + unsigned long rb_rptr_swap : 2; + unsigned long rb_rptr_addr : 22; + unsigned long : 8; + } cp_rb_rptr_addr_t; + +typedef union { + unsigned long val : 32; + cp_rb_rptr_addr_t f; +} cp_rb_rptr_addr_u; + +typedef struct _cp_rb_rptr_t { + unsigned long rb_rptr : 23; + unsigned long : 9; + } cp_rb_rptr_t; + +typedef union { + unsigned long val : 32; + cp_rb_rptr_t f; +} cp_rb_rptr_u; + +typedef struct _cp_rb_rptr_wr_t { + unsigned long rb_rptr_wr : 23; + unsigned long : 9; + } cp_rb_rptr_wr_t; + +typedef union { + unsigned long val : 32; + cp_rb_rptr_wr_t f; +} cp_rb_rptr_wr_u; + +typedef struct _cp_rb_wptr_t { + unsigned long rb_wptr : 23; + unsigned long : 9; + } cp_rb_wptr_t; + +typedef union { + unsigned long val : 32; + cp_rb_wptr_t f; +} cp_rb_wptr_u; + +typedef struct _cp_ib_base_t { + unsigned long : 2; + unsigned long ib_base : 22; + unsigned long : 8; + } cp_ib_base_t; + +typedef union { + unsigned long val : 32; + cp_ib_base_t f; +} cp_ib_base_u; + +typedef struct _cp_ib_bufsz_t { + unsigned long ib_bufsz : 23; + unsigned long : 9; + } cp_ib_bufsz_t; + +typedef union { + unsigned long val : 32; + cp_ib_bufsz_t f; +} cp_ib_bufsz_u; + +typedef struct _cp_csq_cntl_t { + unsigned long csq_cnt_primary : 8; + unsigned long csq_cnt_indirect : 8; + unsigned long : 12; + unsigned long csq_mode : 4; + } cp_csq_cntl_t; + +typedef union { + unsigned long val : 32; + cp_csq_cntl_t f; +} cp_csq_cntl_u; + +typedef struct _cp_csq_aper_primary_t { + unsigned long cp_csq_aper_primary : 32; + } cp_csq_aper_primary_t; + +typedef union { + unsigned long val : 32; + cp_csq_aper_primary_t f; +} cp_csq_aper_primary_u; + +typedef struct _cp_csq_aper_indirect_t { + unsigned long cp_csq_aper_indirect : 32; + } cp_csq_aper_indirect_t; + +typedef union { + unsigned long val : 32; + cp_csq_aper_indirect_t f; +} cp_csq_aper_indirect_u; + +typedef struct _cp_me_cntl_t { + unsigned long me_stat : 16; + unsigned long me_statmux : 5; + unsigned long : 8; + unsigned long me_busy : 1; + unsigned long me_mode : 1; + unsigned long me_step : 1; + } cp_me_cntl_t; + +typedef union { + unsigned long val : 32; + cp_me_cntl_t f; +} cp_me_cntl_u; + +typedef struct _cp_me_ram_addr_t { + unsigned long me_ram_addr : 8; + unsigned long : 24; + } cp_me_ram_addr_t; + +typedef union { + unsigned long val : 32; + cp_me_ram_addr_t f; +} cp_me_ram_addr_u; + +typedef struct _cp_me_ram_raddr_t { + unsigned long me_ram_raddr : 8; + unsigned long : 24; + } cp_me_ram_raddr_t; + +typedef union { + unsigned long val : 32; + cp_me_ram_raddr_t f; +} cp_me_ram_raddr_u; + +typedef struct _cp_me_ram_datah_t { + unsigned long me_ram_datah : 6; + unsigned long : 26; + } cp_me_ram_datah_t; + +typedef union { + unsigned long val : 32; + cp_me_ram_datah_t f; +} cp_me_ram_datah_u; + +typedef struct _cp_me_ram_datal_t { + unsigned long me_ram_datal : 32; + } cp_me_ram_datal_t; + +typedef union { + unsigned long val : 32; + cp_me_ram_datal_t f; +} cp_me_ram_datal_u; + +typedef struct _cp_debug_t { + unsigned long cp_debug : 32; + } cp_debug_t; + +typedef union { + unsigned long val : 32; + cp_debug_t f; +} cp_debug_u; + +typedef struct _scratch_reg0_t { + unsigned long scratch_reg0 : 32; + } scratch_reg0_t; + +typedef union { + unsigned long val : 32; + scratch_reg0_t f; +} scratch_reg0_u; + +typedef struct _scratch_reg1_t { + unsigned long scratch_reg1 : 32; + } scratch_reg1_t; + +typedef union { + unsigned long val : 32; + scratch_reg1_t f; +} scratch_reg1_u; + +typedef struct _scratch_reg2_t { + unsigned long scratch_reg2 : 32; + } scratch_reg2_t; + +typedef union { + unsigned long val : 32; + scratch_reg2_t f; +} scratch_reg2_u; + +typedef struct _scratch_reg3_t { + unsigned long scratch_reg3 : 32; + } scratch_reg3_t; + +typedef union { + unsigned long val : 32; + scratch_reg3_t f; +} scratch_reg3_u; + +typedef struct _scratch_reg4_t { + unsigned long scratch_reg4 : 32; + } scratch_reg4_t; + +typedef union { + unsigned long val : 32; + scratch_reg4_t f; +} scratch_reg4_u; + +typedef struct _scratch_reg5_t { + unsigned long scratch_reg5 : 32; + } scratch_reg5_t; + +typedef union { + unsigned long val : 32; + scratch_reg5_t f; +} scratch_reg5_u; + +typedef struct _scratch_umsk_t { + unsigned long scratch_umsk : 6; + unsigned long : 10; + unsigned long scratch_swap : 2; + unsigned long : 14; + } scratch_umsk_t; + +typedef union { + unsigned long val : 32; + scratch_umsk_t f; +} scratch_umsk_u; + +typedef struct _scratch_addr_t { + unsigned long : 5; + unsigned long scratch_addr : 27; + } scratch_addr_t; + +typedef union { + unsigned long val : 32; + scratch_addr_t f; +} scratch_addr_u; + +typedef struct _cp_csq_addr_t { + unsigned long : 2; + unsigned long csq_addr : 8; + unsigned long : 22; + } cp_csq_addr_t; + +typedef union { + unsigned long val : 32; + cp_csq_addr_t f; +} cp_csq_addr_u; + +typedef struct _cp_csq_data_t { + unsigned long csq_data : 32; + } cp_csq_data_t; + +typedef union { + unsigned long val : 32; + cp_csq_data_t f; +} cp_csq_data_u; + +typedef struct _cp_csq_stat_t { + unsigned long csq_rptr_primary : 8; + unsigned long csq_wptr_primary : 8; + unsigned long csq_rptr_indirect : 8; + unsigned long csq_wptr_indirect : 8; + } cp_csq_stat_t; + +typedef union { + unsigned long val : 32; + cp_csq_stat_t f; +} cp_csq_stat_u; + +typedef struct _cp_stat_t { + unsigned long mru_busy : 1; + unsigned long mwu_busy : 1; + unsigned long rsiu_busy : 1; + unsigned long rciu_busy : 1; + unsigned long : 5; + unsigned long csf_primary_busy : 1; + unsigned long csf_indirect_busy : 1; + unsigned long csq_primary_busy : 1; + unsigned long csq_indirect_busy : 1; + unsigned long csi_busy : 1; + unsigned long : 14; + unsigned long guidma_busy : 1; + unsigned long viddma_busy : 1; + unsigned long cmdstrm_busy : 1; + unsigned long cp_busy : 1; + } cp_stat_t; + +typedef union { + unsigned long val : 32; + cp_stat_t f; +} cp_stat_u; + +typedef struct _gen_int_cntl_t { + unsigned long crtc_vblank_mask : 1; + unsigned long crtc_vline_mask : 1; + unsigned long crtc_hwint1_mask : 1; + unsigned long crtc_hwint2_mask : 1; + unsigned long : 15; + unsigned long gui_idle_mask : 1; + unsigned long : 8; + unsigned long pm4_idle_int_mask : 1; + unsigned long dvi_i2c_int_mask : 1; + unsigned long : 2; + } gen_int_cntl_t; + +typedef union { + unsigned long val : 32; + gen_int_cntl_t f; +} gen_int_cntl_u; + +typedef struct _gen_int_status_rd_t { + unsigned long crtc_vblank_stat : 1; + unsigned long crtc_vline_stat : 1; + unsigned long crtc_hwint1_stat : 1; + unsigned long crtc_hwint2_stat : 1; + unsigned long : 15; + unsigned long gui_idle_stat : 1; + unsigned long : 8; + unsigned long pm4_idle_int_stat : 1; + unsigned long dvi_i2c_int_stat : 1; + unsigned long : 2; + } gen_int_status_rd_t; + +typedef union { + unsigned long val : 32; + gen_int_status_rd_t f; +} gen_int_status_rd_u; + +typedef struct _gen_int_status_wr_t { + unsigned long crtc_vblank_stat_ak : 1; + unsigned long crtc_vline_stat_ak : 1; + unsigned long crtc_hwint1_stat_ak : 1; + unsigned long crtc_hwint2_stat_ak : 1; + unsigned long : 15; + unsigned long gui_idle_stat_ak : 1; + unsigned long : 8; + unsigned long pm4_idle_int_ak : 1; + unsigned long dvi_i2c_int_ak : 1; + unsigned long : 2; + } gen_int_status_wr_t; + +typedef union { + unsigned long val : 32; + gen_int_status_wr_t f; +} gen_int_status_wr_u; + +typedef struct _lcd_format_t { + unsigned long lcd_type : 4; + unsigned long color_to_mono : 1; + unsigned long data_inv : 1; + unsigned long stn_fm : 2; + unsigned long tft_fm : 2; + unsigned long scan_lr_en : 1; + unsigned long scan_ud_en : 1; + unsigned long pol_inv : 1; + unsigned long rst_fm : 1; + unsigned long yuv_to_rgb : 1; + unsigned long hr_tft : 1; + unsigned long ulc_panel : 1; + unsigned long : 15; + } lcd_format_t; + +typedef union { + unsigned long val : 32; + lcd_format_t f; +} lcd_format_u; + +typedef struct _graphic_ctrl_t { + unsigned long color_depth : 3; // 6 + unsigned long portrait_mode : 2; // 0 + unsigned long low_power_on : 1; // 1 + unsigned long req_freq : 4; // 5 + unsigned long en_crtc : 1; // 1 + unsigned long en_graphic_req : 1; // 1 + unsigned long en_graphic_crtc : 1; // 1 + unsigned long total_req_graphic : 9; // 240 + unsigned long lcd_pclk_on : 1; // 1 + unsigned long lcd_sclk_on : 1; // 1 + unsigned long pclk_running : 1; // 1 + unsigned long sclk_running : 1; // 1 + unsigned long : 6; + } graphic_ctrl_t; + +typedef union { + unsigned long val : 32; + graphic_ctrl_t f; +} graphic_ctrl_u; + +typedef struct _graphic_offset_t { + unsigned long graphic_offset : 24; + unsigned long : 8; + } graphic_offset_t; + +typedef union { + unsigned long val : 32; + graphic_offset_t f; +} graphic_offset_u; + +typedef struct _graphic_pitch_t { + unsigned long graphic_pitch : 11; + unsigned long : 21; + } graphic_pitch_t; + +typedef union { + unsigned long val : 32; + graphic_pitch_t f; +} graphic_pitch_u; + +typedef struct _crtc_total_t { + unsigned long crtc_h_total : 10; + unsigned long : 6; + unsigned long crtc_v_total : 10; + unsigned long : 6; + } crtc_total_t; + +typedef union { + unsigned long val : 32; + crtc_total_t f; +} crtc_total_u; + +typedef struct _active_h_disp_t { + unsigned long active_h_start : 10; + unsigned long : 6; + unsigned long active_h_end : 10; + unsigned long : 6; + } active_h_disp_t; + +typedef union { + unsigned long val : 32; + active_h_disp_t f; +} active_h_disp_u; + +typedef struct _active_v_disp_t { + unsigned long active_v_start : 10; + unsigned long : 6; + unsigned long active_v_end : 10; + unsigned long : 6; + } active_v_disp_t; + +typedef union { + unsigned long val : 32; + active_v_disp_t f; +} active_v_disp_u; + +typedef struct _graphic_h_disp_t { + unsigned long graphic_h_start : 10; + unsigned long : 6; + unsigned long graphic_h_end : 10; + unsigned long : 6; + } graphic_h_disp_t; + +typedef union { + unsigned long val : 32; + graphic_h_disp_t f; +} graphic_h_disp_u; + +typedef struct _graphic_v_disp_t { + unsigned long graphic_v_start : 10; + unsigned long : 6; + unsigned long graphic_v_end : 10; + unsigned long : 6; + } graphic_v_disp_t; + +typedef union { + unsigned long val : 32; + graphic_v_disp_t f; +} graphic_v_disp_u; + +typedef struct _video_ctrl_t { + unsigned long video_mode : 1; // 00000001 + unsigned long keyer_en : 1; // 00000002 + unsigned long en_video_req : 1; // 00000004 + unsigned long en_graphic_req_video : 1; // 00000008 + unsigned long en_video_crtc : 1; // 00000010 + unsigned long video_hor_exp : 2; // 00000060 + unsigned long video_ver_exp : 2; // 00000180 + unsigned long uv_combine : 1; // 00000200 + unsigned long total_req_video : 9; // 0007fc00 + unsigned long video_ch_sel : 1; // 00080000 + unsigned long video_portrait : 2; // 00300000 + unsigned long yuv2rgb_en : 1; // 00400000 + unsigned long yuv2rgb_option : 1; // 00800000 + unsigned long video_inv_hor : 1; // 01000000 + unsigned long video_inv_ver : 1; // 02000000 + unsigned long gamma_sel : 2; // 0c000000 + unsigned long dis_limit : 1; // 10000000 + unsigned long en_uv_hblend : 1; // 20000000 + unsigned long rgb_gamma_sel : 2; // c0000000 + } video_ctrl_t; + +typedef union { + unsigned long val : 32; + video_ctrl_t f; +} video_ctrl_u; + +typedef struct _graphic_key_t { + unsigned long keyer_color : 16; + unsigned long keyer_mask : 16; + } graphic_key_t; + +typedef union { + unsigned long val : 32; + graphic_key_t f; +} graphic_key_u; + +typedef struct _video_y_offset_t { + unsigned long y_offset : 24; + unsigned long : 8; + } video_y_offset_t; + +typedef union { + unsigned long val : 32; + video_y_offset_t f; +} video_y_offset_u; + +typedef struct _video_y_pitch_t { + unsigned long y_pitch : 11; + unsigned long : 21; + } video_y_pitch_t; + +typedef union { + unsigned long val : 32; + video_y_pitch_t f; +} video_y_pitch_u; + +typedef struct _video_u_offset_t { + unsigned long u_offset : 24; + unsigned long : 8; + } video_u_offset_t; + +typedef union { + unsigned long val : 32; + video_u_offset_t f; +} video_u_offset_u; + +typedef struct _video_u_pitch_t { + unsigned long u_pitch : 11; + unsigned long : 21; + } video_u_pitch_t; + +typedef union { + unsigned long val : 32; + video_u_pitch_t f; +} video_u_pitch_u; + +typedef struct _video_v_offset_t { + unsigned long v_offset : 24; + unsigned long : 8; + } video_v_offset_t; + +typedef union { + unsigned long val : 32; + video_v_offset_t f; +} video_v_offset_u; + +typedef struct _video_v_pitch_t { + unsigned long v_pitch : 11; + unsigned long : 21; + } video_v_pitch_t; + +typedef union { + unsigned long val : 32; + video_v_pitch_t f; +} video_v_pitch_u; + +typedef struct _video_h_pos_t { + unsigned long video_h_start : 10; + unsigned long : 6; + unsigned long video_h_end : 10; + unsigned long : 6; + } video_h_pos_t; + +typedef union { + unsigned long val : 32; + video_h_pos_t f; +} video_h_pos_u; + +typedef struct _video_v_pos_t { + unsigned long video_v_start : 10; + unsigned long : 6; + unsigned long video_v_end : 10; + unsigned long : 6; + } video_v_pos_t; + +typedef union { + unsigned long val : 32; + video_v_pos_t f; +} video_v_pos_u; + +typedef struct _brightness_cntl_t { + unsigned long brightness : 7; + unsigned long : 25; + } brightness_cntl_t; + +typedef union { + unsigned long val : 32; + brightness_cntl_t f; +} brightness_cntl_u; + +typedef struct _cursor1_offset_t { + unsigned long cur1_offset : 24; + unsigned long cur1_x_offset : 4; + unsigned long cur1_y_offset : 4; + } cursor1_offset_t; + +typedef union { + unsigned long val : 32; + cursor1_offset_t f; +} cursor1_offset_u; + +typedef struct _cursor1_h_pos_t { + unsigned long cur1_h_start : 10; + unsigned long : 6; + unsigned long cur1_h_end : 10; + unsigned long : 5; + unsigned long cur1_en : 1; + } cursor1_h_pos_t; + +typedef union { + unsigned long val : 32; + cursor1_h_pos_t f; +} cursor1_h_pos_u; + +typedef struct _cursor1_v_pos_t { + unsigned long cur1_v_start : 10; + unsigned long : 6; + unsigned long cur1_v_end : 10; + unsigned long : 6; + } cursor1_v_pos_t; + +typedef union { + unsigned long val : 32; + cursor1_v_pos_t f; +} cursor1_v_pos_u; + +typedef struct _cursor1_color0_t { + unsigned long cur1_color0_r : 8; + unsigned long cur1_color0_g : 8; + unsigned long cur1_color0_b : 8; + unsigned long : 8; + } cursor1_color0_t; + +typedef union { + unsigned long val : 32; + cursor1_color0_t f; +} cursor1_color0_u; + +typedef struct _cursor1_color1_t { + unsigned long cur1_color1_r : 8; + unsigned long cur1_color1_g : 8; + unsigned long cur1_color1_b : 8; + unsigned long : 8; + } cursor1_color1_t; + +typedef union { + unsigned long val : 32; + cursor1_color1_t f; +} cursor1_color1_u; + +typedef struct _cursor2_offset_t { + unsigned long cur2_offset : 24; + unsigned long cur2_x_offset : 4; + unsigned long cur2_y_offset : 4; + } cursor2_offset_t; + +typedef union { + unsigned long val : 32; + cursor2_offset_t f; +} cursor2_offset_u; + +typedef struct _cursor2_h_pos_t { + unsigned long cur2_h_start : 10; + unsigned long : 6; + unsigned long cur2_h_end : 10; + unsigned long : 5; + unsigned long cur2_en : 1; + } cursor2_h_pos_t; + +typedef union { + unsigned long val : 32; + cursor2_h_pos_t f; +} cursor2_h_pos_u; + +typedef struct _cursor2_v_pos_t { + unsigned long cur2_v_start : 10; + unsigned long : 6; + unsigned long cur2_v_end : 10; + unsigned long : 6; + } cursor2_v_pos_t; + +typedef union { + unsigned long val : 32; + cursor2_v_pos_t f; +} cursor2_v_pos_u; + +typedef struct _cursor2_color0_t { + unsigned long cur2_color0_r : 8; + unsigned long cur2_color0_g : 8; + unsigned long cur2_color0_b : 8; + unsigned long : 8; + } cursor2_color0_t; + +typedef union { + unsigned long val : 32; + cursor2_color0_t f; +} cursor2_color0_u; + +typedef struct _cursor2_color1_t { + unsigned long cur2_color1_r : 8; + unsigned long cur2_color1_g : 8; + unsigned long cur2_color1_b : 8; + unsigned long : 8; + } cursor2_color1_t; + +typedef union { + unsigned long val : 32; + cursor2_color1_t f; +} cursor2_color1_u; + +typedef struct _disp_int_cntl_t { + unsigned long vline_int_pos : 10; + unsigned long : 6; + unsigned long hpos_int_pos : 10; + unsigned long : 4; + unsigned long vblank_int_pol : 1; + unsigned long frame_int_pol : 1; + } disp_int_cntl_t; + +typedef union { + unsigned long val : 32; + disp_int_cntl_t f; +} disp_int_cntl_u; + +typedef struct _crtc_ss_t { + unsigned long ss_start : 10; + unsigned long : 6; + unsigned long ss_end : 10; + unsigned long : 2; + unsigned long ss_align : 1; + unsigned long ss_pol : 1; + unsigned long ss_run_mode : 1; + unsigned long ss_en : 1; + } crtc_ss_t; + +typedef union { + unsigned long val : 32; + crtc_ss_t f; +} crtc_ss_u; + +typedef struct _crtc_ls_t { + unsigned long ls_start : 10; + unsigned long : 6; + unsigned long ls_end : 10; + unsigned long : 2; + unsigned long ls_align : 1; + unsigned long ls_pol : 1; + unsigned long ls_run_mode : 1; + unsigned long ls_en : 1; + } crtc_ls_t; + +typedef union { + unsigned long val : 32; + crtc_ls_t f; +} crtc_ls_u; + +typedef struct _crtc_rev_t { + unsigned long rev_pos : 10; + unsigned long : 6; + unsigned long rev_align : 1; + unsigned long rev_freq_nref : 5; + unsigned long rev_en : 1; + unsigned long : 9; + } crtc_rev_t; + +typedef union { + unsigned long val : 32; + crtc_rev_t f; +} crtc_rev_u; + +typedef struct _crtc_dclk_t { + unsigned long dclk_start : 10; + unsigned long : 6; + unsigned long dclk_end : 10; + unsigned long : 1; + unsigned long dclk_run_mode : 2; + unsigned long dclk_pol : 1; + unsigned long dclk_align : 1; + unsigned long dclk_en : 1; + } crtc_dclk_t; + +typedef union { + unsigned long val : 32; + crtc_dclk_t f; +} crtc_dclk_u; + +typedef struct _crtc_gs_t { + unsigned long gs_start : 10; + unsigned long : 6; + unsigned long gs_end : 10; + unsigned long : 3; + unsigned long gs_align : 1; + unsigned long gs_pol : 1; + unsigned long gs_en : 1; + } crtc_gs_t; + +typedef union { + unsigned long val : 32; + crtc_gs_t f; +} crtc_gs_u; + +typedef struct _crtc_vpos_gs_t { + unsigned long gs_vpos_start : 10; + unsigned long : 6; + unsigned long gs_vpos_end : 10; + unsigned long : 6; + } crtc_vpos_gs_t; + +typedef union { + unsigned long val : 32; + crtc_vpos_gs_t f; +} crtc_vpos_gs_u; + +typedef struct _crtc_gclk_t { + unsigned long gclk_start : 10; + unsigned long : 6; + unsigned long gclk_end : 10; + unsigned long : 3; + unsigned long gclk_align : 1; + unsigned long gclk_pol : 1; + unsigned long gclk_en : 1; + } crtc_gclk_t; + +typedef union { + unsigned long val : 32; + crtc_gclk_t f; +} crtc_gclk_u; + +typedef struct _crtc_goe_t { + unsigned long goe_start : 10; + unsigned long : 6; + unsigned long goe_end : 10; + unsigned long : 3; + unsigned long goe_align : 1; + unsigned long goe_pol : 1; + unsigned long goe_en : 1; + } crtc_goe_t; + +typedef union { + unsigned long val : 32; + crtc_goe_t f; +} crtc_goe_u; + +typedef struct _crtc_frame_t { + unsigned long crtc_fr_start : 10; + unsigned long : 6; + unsigned long crtc_fr_end : 10; + unsigned long : 4; + unsigned long crtc_frame_en : 1; + unsigned long crtc_frame_align : 1; + } crtc_frame_t; + +typedef union { + unsigned long val : 32; + crtc_frame_t f; +} crtc_frame_u; + +typedef struct _crtc_frame_vpos_t { + unsigned long crtc_fr_vpos : 10; + unsigned long : 22; + } crtc_frame_vpos_t; + +typedef union { + unsigned long val : 32; + crtc_frame_vpos_t f; +} crtc_frame_vpos_u; + +typedef struct _gpio_data_t { + unsigned long gio_out : 16; + unsigned long gio_in : 16; + } gpio_data_t; + +typedef union { + unsigned long val : 32; + gpio_data_t f; +} gpio_data_u; + +typedef struct _gpio_cntl1_t { + unsigned long gio_pd : 16; + unsigned long gio_schmen : 16; + } gpio_cntl1_t; + +typedef union { + unsigned long val : 32; + gpio_cntl1_t f; +} gpio_cntl1_u; + +typedef struct _gpio_cntl2_t { + unsigned long gio_oe : 16; + unsigned long gio_srp : 1; + unsigned long gio_srn : 1; + unsigned long gio_sp : 4; + unsigned long gio_sn : 4; + unsigned long : 6; + } gpio_cntl2_t; + +typedef union { + unsigned long val : 32; + gpio_cntl2_t f; +} gpio_cntl2_u; + +typedef struct _lcdd_cntl1_t { + unsigned long lcdd_pd : 18; + unsigned long lcdd_srp : 1; + unsigned long lcdd_srn : 1; + unsigned long lcdd_sp : 4; + unsigned long lcdd_sn : 4; + unsigned long lcdd_align : 1; + unsigned long : 3; + } lcdd_cntl1_t; + +typedef union { + unsigned long val : 32; + lcdd_cntl1_t f; +} lcdd_cntl1_u; + +typedef struct _lcdd_cntl2_t { + unsigned long lcdd_oe : 18; + unsigned long : 14; + } lcdd_cntl2_t; + +typedef union { + unsigned long val : 32; + lcdd_cntl2_t f; +} lcdd_cntl2_u; + +typedef struct _genlcd_cntl1_t { + unsigned long dclk_oe : 1; + unsigned long dclk_pd : 1; + unsigned long dclk_srp : 1; + unsigned long dclk_srn : 1; + unsigned long dclk_sp : 4; + unsigned long dclk_sn : 4; + unsigned long ss_oe : 1; + unsigned long ss_pd : 1; + unsigned long ls_oe : 1; + unsigned long ls_pd : 1; + unsigned long gs_oe : 1; + unsigned long gs_pd : 1; + unsigned long goe_oe : 1; + unsigned long goe_pd : 1; + unsigned long rev_oe : 1; + unsigned long rev_pd : 1; + unsigned long frame_oe : 1; + unsigned long frame_pd : 1; + unsigned long : 8; + } genlcd_cntl1_t; + +typedef union { + unsigned long val : 32; + genlcd_cntl1_t f; +} genlcd_cntl1_u; + +typedef struct _genlcd_cntl2_t { + unsigned long gclk_oe : 1; + unsigned long gclk_pd : 1; + unsigned long gclk_srp : 1; + unsigned long gclk_srn : 1; + unsigned long gclk_sp : 4; + unsigned long gclk_sn : 4; + unsigned long genlcd_srp : 1; + unsigned long genlcd_srn : 1; + unsigned long genlcd_sp : 4; + unsigned long genlcd_sn : 4; + unsigned long : 10; + } genlcd_cntl2_t; + +typedef union { + unsigned long val : 32; + genlcd_cntl2_t f; +} genlcd_cntl2_u; + +typedef struct _disp_debug_t { + unsigned long disp_debug : 32; + } disp_debug_t; + +typedef union { + unsigned long val : 32; + disp_debug_t f; +} disp_debug_u; + +typedef struct _disp_db_buf_cntl_rd_t { + unsigned long en_db_buf : 1; + unsigned long update_db_buf_done : 1; + unsigned long db_buf_cntl : 6; + unsigned long : 24; + } disp_db_buf_cntl_rd_t; + +typedef union { + unsigned long val : 32; + disp_db_buf_cntl_rd_t f; +} disp_db_buf_cntl_rd_u; + +typedef struct _disp_db_buf_cntl_wr_t { + unsigned long en_db_buf : 1; + unsigned long update_db_buf : 1; + unsigned long db_buf_cntl : 6; + unsigned long : 24; + } disp_db_buf_cntl_wr_t; + +typedef union { + unsigned long val : 32; + disp_db_buf_cntl_wr_t f; +} disp_db_buf_cntl_wr_u; + +typedef struct _disp_crc_sig_t { + unsigned long crc_sig_r : 6; + unsigned long crc_sig_g : 6; + unsigned long crc_sig_b : 6; + unsigned long crc_cont_en : 1; + unsigned long crc_en : 1; + unsigned long crc_mask_en : 1; + unsigned long crc_sig_cntl : 6; + unsigned long : 5; + } disp_crc_sig_t; + +typedef union { + unsigned long val : 32; + disp_crc_sig_t f; +} disp_crc_sig_u; + +typedef struct _crtc_default_count_t { + unsigned long crtc_hcount_def : 10; + unsigned long : 6; + unsigned long crtc_vcount_def : 10; + unsigned long : 6; + } crtc_default_count_t; + +typedef union { + unsigned long val : 32; + crtc_default_count_t f; +} crtc_default_count_u; + +typedef struct _lcd_background_color_t { + unsigned long lcd_bg_red : 8; + unsigned long lcd_bg_green : 8; + unsigned long lcd_bg_blue : 8; + unsigned long : 8; + } lcd_background_color_t; + +typedef union { + unsigned long val : 32; + lcd_background_color_t f; +} lcd_background_color_u; + +typedef struct _crtc_ps2_t { + unsigned long ps2_start : 10; + unsigned long : 6; + unsigned long ps2_end : 10; + unsigned long : 4; + unsigned long ps2_pol : 1; + unsigned long ps2_en : 1; + } crtc_ps2_t; + +typedef union { + unsigned long val : 32; + crtc_ps2_t f; +} crtc_ps2_u; + +typedef struct _crtc_ps2_vpos_t { + unsigned long ps2_vpos_start : 10; + unsigned long : 6; + unsigned long ps2_vpos_end : 10; + unsigned long : 6; + } crtc_ps2_vpos_t; + +typedef union { + unsigned long val : 32; + crtc_ps2_vpos_t f; +} crtc_ps2_vpos_u; + +typedef struct _crtc_ps1_active_t { + unsigned long ps1_h_start : 10; + unsigned long : 6; + unsigned long ps1_h_end : 10; + unsigned long : 3; + unsigned long ps1_pol : 1; + unsigned long ps1_en : 1; + unsigned long ps1_use_nactive : 1; + } crtc_ps1_active_t; + +typedef union { + unsigned long val : 32; + crtc_ps1_active_t f; +} crtc_ps1_active_u; + +typedef struct _crtc_ps1_nactive_t { + unsigned long ps1_h_start_na : 10; + unsigned long : 6; + unsigned long ps1_h_end_na : 10; + unsigned long : 5; + unsigned long ps1_en_na : 1; + } crtc_ps1_nactive_t; + +typedef union { + unsigned long val : 32; + crtc_ps1_nactive_t f; +} crtc_ps1_nactive_u; + +typedef struct _crtc_gclk_ext_t { + unsigned long gclk_alter_start : 10; + unsigned long : 6; + unsigned long gclk_alter_width : 2; + unsigned long gclk_en_alter : 1; + unsigned long gclk_db_width : 2; + unsigned long : 11; + } crtc_gclk_ext_t; + +typedef union { + unsigned long val : 32; + crtc_gclk_ext_t f; +} crtc_gclk_ext_u; + +typedef struct _crtc_alw_t { + unsigned long alw_hstart : 10; + unsigned long : 6; + unsigned long alw_hend : 10; + unsigned long : 4; + unsigned long alw_delay : 1; + unsigned long alw_en : 1; + } crtc_alw_t; + +typedef union { + unsigned long val : 32; + crtc_alw_t f; +} crtc_alw_u; + +typedef struct _crtc_alw_vpos_t { + unsigned long alw_vstart : 10; + unsigned long : 6; + unsigned long alw_vend : 10; + unsigned long : 6; + } crtc_alw_vpos_t; + +typedef union { + unsigned long val : 32; + crtc_alw_vpos_t f; +} crtc_alw_vpos_u; + +typedef struct _crtc_psk_t { + unsigned long psk_vstart : 10; + unsigned long : 6; + unsigned long psk_vend : 10; + unsigned long : 4; + unsigned long psk_pol : 1; + unsigned long psk_en : 1; + } crtc_psk_t; + +typedef union { + unsigned long val : 32; + crtc_psk_t f; +} crtc_psk_u; + +typedef struct _crtc_psk_hpos_t { + unsigned long psk_hstart : 10; + unsigned long : 6; + unsigned long psk_hend : 10; + unsigned long : 6; + } crtc_psk_hpos_t; + +typedef union { + unsigned long val : 32; + crtc_psk_hpos_t f; +} crtc_psk_hpos_u; + +typedef struct _crtc_cv4_start_t { + unsigned long cv4_vstart : 10; + unsigned long : 20; + unsigned long cv4_pol : 1; + unsigned long cv4_en : 1; + } crtc_cv4_start_t; + +typedef union { + unsigned long val : 32; + crtc_cv4_start_t f; +} crtc_cv4_start_u; + +typedef struct _crtc_cv4_end_t { + unsigned long cv4_vend1 : 10; + unsigned long : 6; + unsigned long cv4_vend2 : 10; + unsigned long : 6; + } crtc_cv4_end_t; + +typedef union { + unsigned long val : 32; + crtc_cv4_end_t f; +} crtc_cv4_end_u; + +typedef struct _crtc_cv4_hpos_t { + unsigned long cv4_hstart : 10; + unsigned long : 6; + unsigned long cv4_hend : 10; + unsigned long : 6; + } crtc_cv4_hpos_t; + +typedef union { + unsigned long val : 32; + crtc_cv4_hpos_t f; +} crtc_cv4_hpos_u; + +typedef struct _crtc_eck_t { + unsigned long eck_freq1 : 3; + unsigned long eck_en : 1; + unsigned long : 28; + } crtc_eck_t; + +typedef union { + unsigned long val : 32; + crtc_eck_t f; +} crtc_eck_u; + +typedef struct _refresh_cntl_t { + unsigned long ref_frame : 3; + unsigned long nref_frame : 5; + unsigned long ref_cntl : 1; + unsigned long stop_sm_nref : 1; + unsigned long stop_req_nref : 1; + unsigned long : 21; + } refresh_cntl_t; + +typedef union { + unsigned long val : 32; + refresh_cntl_t f; +} refresh_cntl_u; + +typedef struct _genlcd_cntl3_t { + unsigned long ps1_oe : 1; + unsigned long ps1_pd : 1; + unsigned long ps2_oe : 1; + unsigned long ps2_pd : 1; + unsigned long rev2_oe : 1; + unsigned long rev2_pd : 1; + unsigned long awl_oe : 1; + unsigned long awl_pd : 1; + unsigned long dinv_oe : 1; + unsigned long dinv_pd : 1; + unsigned long psk_out : 1; + unsigned long psd_out : 1; + unsigned long eck_out : 1; + unsigned long cv4_out : 1; + unsigned long ps1_out : 1; + unsigned long ps2_out : 1; + unsigned long rev_out : 1; + unsigned long rev2_out : 1; + unsigned long : 14; + } genlcd_cntl3_t; + +typedef union { + unsigned long val : 32; + genlcd_cntl3_t f; +} genlcd_cntl3_u; + +typedef struct _gpio_data2_t { + unsigned long gio2_out : 16; + unsigned long gio2_in : 16; + } gpio_data2_t; + +typedef union { + unsigned long val : 32; + gpio_data2_t f; +} gpio_data2_u; + +typedef struct _gpio_cntl3_t { + unsigned long gio2_pd : 16; + unsigned long gio2_schmen : 16; + } gpio_cntl3_t; + +typedef union { + unsigned long val : 32; + gpio_cntl3_t f; +} gpio_cntl3_u; + +typedef struct _gpio_cntl4_t { + unsigned long gio2_oe : 16; + unsigned long : 16; + } gpio_cntl4_t; + +typedef union { + unsigned long val : 32; + gpio_cntl4_t f; +} gpio_cntl4_u; + +typedef struct _chip_strap_t { + unsigned long config_strap : 8; + unsigned long pkg_strap : 1; + unsigned long : 23; + } chip_strap_t; + +typedef union { + unsigned long val : 32; + chip_strap_t f; +} chip_strap_u; + +typedef struct _disp_debug2_t { + unsigned long disp_debug2 : 32; + } disp_debug2_t; + +typedef union { + unsigned long val : 32; + disp_debug2_t f; +} disp_debug2_u; + +typedef struct _debug_bus_cntl_t { + unsigned long debug_testmux : 4; + unsigned long debug_testsel : 4; + unsigned long debug_gioa_sel : 2; + unsigned long debug_giob_sel : 2; + unsigned long debug_clk_sel : 1; + unsigned long debug_clk_inv : 1; + unsigned long : 2; + unsigned long debug_bus : 16; + } debug_bus_cntl_t; + +typedef union { + unsigned long val : 32; + debug_bus_cntl_t f; +} debug_bus_cntl_u; + +typedef struct _gamma_value1_t { + unsigned long gamma1 : 8; + unsigned long gamma2 : 8; + unsigned long gamma3 : 8; + unsigned long gamma4 : 8; + } gamma_value1_t; + +typedef union { + unsigned long val : 32; + gamma_value1_t f; +} gamma_value1_u; + +typedef struct _gamma_value2_t { + unsigned long gamma5 : 8; + unsigned long gamma6 : 8; + unsigned long gamma7 : 8; + unsigned long gamma8 : 8; + } gamma_value2_t; + +typedef union { + unsigned long val : 32; + gamma_value2_t f; +} gamma_value2_u; + +typedef struct _gamma_slope_t { + unsigned long slope1 : 3; + unsigned long slope2 : 3; + unsigned long slope3 : 3; + unsigned long slope4 : 3; + unsigned long slope5 : 3; + unsigned long slope6 : 3; + unsigned long slope7 : 3; + unsigned long slope8 : 3; + unsigned long : 8; + } gamma_slope_t; + +typedef union { + unsigned long val : 32; + gamma_slope_t f; +} gamma_slope_u; + +typedef struct _gen_status_t { + unsigned long status : 16; + unsigned long : 16; + } gen_status_t; + +typedef union { + unsigned long val : 32; + gen_status_t f; +} gen_status_u; + +typedef struct _hw_int_t { + unsigned long hwint1_pos : 5; + unsigned long hwint2_pos : 5; + unsigned long hwint1_pol : 1; + unsigned long hwint2_pol : 1; + unsigned long hwint1_en_db : 1; + unsigned long hwint2_en_db : 1; + unsigned long : 18; + } hw_int_t; + +typedef union { + unsigned long val : 32; + hw_int_t f; +} hw_int_u; + +typedef struct _dst_offset_t { + unsigned long dst_offset : 24; + unsigned long : 8; + } dst_offset_t; + +typedef union { + unsigned long val : 32; + dst_offset_t f; +} dst_offset_u; + +typedef struct _dst_pitch_t { + unsigned long dst_pitch : 14; + unsigned long mc_dst_pitch_mul : 2; + unsigned long : 16; + } dst_pitch_t; + +typedef union { + unsigned long val : 32; + dst_pitch_t f; +} dst_pitch_u; + +typedef struct _dst_pitch_offset_t { + unsigned long dst_offset : 20; + unsigned long dst_pitch : 10; + unsigned long mc_dst_pitch_mul : 2; + } dst_pitch_offset_t; + +typedef union { + unsigned long val : 32; + dst_pitch_offset_t f; +} dst_pitch_offset_u; + +typedef struct _dst_x_t { + unsigned long dst_x : 14; + unsigned long : 18; + } dst_x_t; + +typedef union { + unsigned long val : 32; + dst_x_t f; +} dst_x_u; + +typedef struct _dst_y_t { + unsigned long dst_y : 14; + unsigned long : 18; + } dst_y_t; + +typedef union { + unsigned long val : 32; + dst_y_t f; +} dst_y_u; + +typedef struct _dst_x_y_t { + unsigned long dst_y : 14; + unsigned long : 2; + unsigned long dst_x : 14; + unsigned long : 2; + } dst_x_y_t; + +typedef union { + unsigned long val : 32; + dst_x_y_t f; +} dst_x_y_u; + +typedef struct _dst_y_x_t { + unsigned long dst_x : 14; + unsigned long : 2; + unsigned long dst_y : 14; + unsigned long : 2; + } dst_y_x_t; + +typedef union { + unsigned long val : 32; + dst_y_x_t f; +} dst_y_x_u; + +typedef struct _dst_width_t { + unsigned long dst_width_b0 : 8; + unsigned long dst_width_b1 : 6; + unsigned long : 18; + } dst_width_t; + +typedef union { + unsigned long val : 32; + dst_width_t f; +} dst_width_u; + +typedef struct _dst_height_t { + unsigned long dst_height : 14; + unsigned long : 18; + } dst_height_t; + +typedef union { + unsigned long val : 32; + dst_height_t f; +} dst_height_u; + +typedef struct _dst_width_height_t { + unsigned long dst_height : 14; + unsigned long : 2; + unsigned long dst_width_b0 : 8; + unsigned long dst_width_b1 : 6; + unsigned long : 2; + } dst_width_height_t; + +typedef union { + unsigned long val : 32; + dst_width_height_t f; +} dst_width_height_u; + +typedef struct _dst_height_width_t { + unsigned long dst_width_b0 : 8; + unsigned long dst_width_b1 : 6; + unsigned long : 2; + unsigned long dst_height : 14; + unsigned long : 2; + } dst_height_width_t; + +typedef union { + unsigned long val : 32; + dst_height_width_t f; +} dst_height_width_u; + +typedef struct _dst_height_width_8_t { + unsigned long : 16; + unsigned long dst_width_b0 : 8; + unsigned long dst_height : 8; + } dst_height_width_8_t; + +typedef union { + unsigned long val : 32; + dst_height_width_8_t f; +} dst_height_width_8_u; + +typedef struct _dst_height_y_t { + unsigned long dst_y : 14; + unsigned long : 2; + unsigned long dst_height : 14; + unsigned long : 2; + } dst_height_y_t; + +typedef union { + unsigned long val : 32; + dst_height_y_t f; +} dst_height_y_u; + +typedef struct _dst_width_x_t { + unsigned long dst_x : 14; + unsigned long : 2; + unsigned long dst_width_b0 : 8; + unsigned long dst_width_b1 : 6; + unsigned long : 2; + } dst_width_x_t; + +typedef union { + unsigned long val : 32; + dst_width_x_t f; +} dst_width_x_u; + +typedef struct _dst_width_x_incy_t { + unsigned long dst_x : 14; + unsigned long : 2; + unsigned long dst_width_b0 : 8; + unsigned long dst_width_b1 : 6; + unsigned long : 2; + } dst_width_x_incy_t; + +typedef union { + unsigned long val : 32; + dst_width_x_incy_t f; +} dst_width_x_incy_u; + +typedef struct _dst_line_start_t { + unsigned long dst_start_x : 14; + unsigned long : 2; + unsigned long dst_start_y : 14; + unsigned long : 2; + } dst_line_start_t; + +typedef union { + unsigned long val : 32; + dst_line_start_t f; +} dst_line_start_u; + +typedef struct _dst_line_end_t { + unsigned long dst_end_x : 14; + unsigned long : 2; + unsigned long dst_end_y_b0 : 8; + unsigned long dst_end_y_b1 : 6; + unsigned long : 2; + } dst_line_end_t; + +typedef union { + unsigned long val : 32; + dst_line_end_t f; +} dst_line_end_u; + +typedef struct _brush_offset_t { + unsigned long brush_offset : 24; + unsigned long : 8; + } brush_offset_t; + +typedef union { + unsigned long val : 32; + brush_offset_t f; +} brush_offset_u; + +typedef struct _brush_y_x_t { + unsigned long brush_x : 5; + unsigned long : 3; + unsigned long brush_y : 3; + unsigned long : 21; + } brush_y_x_t; + +typedef union { + unsigned long val : 32; + brush_y_x_t f; +} brush_y_x_u; + +typedef struct _dp_brush_frgd_clr_t { + unsigned long dp_brush_frgd_clr : 32; + } dp_brush_frgd_clr_t; + +typedef union { + unsigned long val : 32; + dp_brush_frgd_clr_t f; +} dp_brush_frgd_clr_u; + +typedef struct _dp_brush_bkgd_clr_t { + unsigned long dp_brush_bkgd_clr : 32; + } dp_brush_bkgd_clr_t; + +typedef union { + unsigned long val : 32; + dp_brush_bkgd_clr_t f; +} dp_brush_bkgd_clr_u; + +typedef struct _src2_offset_t { + unsigned long src2_offset : 24; + unsigned long : 8; + } src2_offset_t; + +typedef union { + unsigned long val : 32; + src2_offset_t f; +} src2_offset_u; + +typedef struct _src2_pitch_t { + unsigned long src2_pitch : 14; + unsigned long src2_pitch_mul : 2; + unsigned long : 16; + } src2_pitch_t; + +typedef union { + unsigned long val : 32; + src2_pitch_t f; +} src2_pitch_u; + +typedef struct _src2_pitch_offset_t { + unsigned long src2_offset : 20; + unsigned long : 2; + unsigned long src2_pitch : 8; + unsigned long src2_pitch_mul : 2; + } src2_pitch_offset_t; + +typedef union { + unsigned long val : 32; + src2_pitch_offset_t f; +} src2_pitch_offset_u; + +typedef struct _src2_x_t { + unsigned long src_x : 14; + unsigned long : 18; + } src2_x_t; + +typedef union { + unsigned long val : 32; + src2_x_t f; +} src2_x_u; + +typedef struct _src2_y_t { + unsigned long src_y : 14; + unsigned long : 18; + } src2_y_t; + +typedef union { + unsigned long val : 32; + src2_y_t f; +} src2_y_u; + +typedef struct _src2_x_y_t { + unsigned long src_y : 14; + unsigned long : 2; + unsigned long src_x : 14; + unsigned long : 2; + } src2_x_y_t; + +typedef union { + unsigned long val : 32; + src2_x_y_t f; +} src2_x_y_u; + +typedef struct _src2_width_t { + unsigned long src2_width : 14; + unsigned long : 18; + } src2_width_t; + +typedef union { + unsigned long val : 32; + src2_width_t f; +} src2_width_u; + +typedef struct _src2_height_t { + unsigned long src2_height : 14; + unsigned long : 18; + } src2_height_t; + +typedef union { + unsigned long val : 32; + src2_height_t f; +} src2_height_u; + +typedef struct _src2_inc_t { + unsigned long src2_xinc : 6; + unsigned long : 2; + unsigned long src2_yinc : 6; + unsigned long : 18; + } src2_inc_t; + +typedef union { + unsigned long val : 32; + src2_inc_t f; +} src2_inc_u; + +typedef struct _src_offset_t { + unsigned long src_offset : 24; + unsigned long : 8; + } src_offset_t; + +typedef union { + unsigned long val : 32; + src_offset_t f; +} src_offset_u; + +typedef struct _src_pitch_t { + unsigned long src_pitch : 14; + unsigned long src_pitch_mul : 2; + unsigned long : 16; + } src_pitch_t; + +typedef union { + unsigned long val : 32; + src_pitch_t f; +} src_pitch_u; + +typedef struct _src_pitch_offset_t { + unsigned long src_offset : 20; + unsigned long src_pitch : 10; + unsigned long src_pitch_mul : 2; + } src_pitch_offset_t; + +typedef union { + unsigned long val : 32; + src_pitch_offset_t f; +} src_pitch_offset_u; + +typedef struct _src_x_t { + unsigned long src_x : 14; + unsigned long : 18; + } src_x_t; + +typedef union { + unsigned long val : 32; + src_x_t f; +} src_x_u; + +typedef struct _src_y_t { + unsigned long src_y : 14; + unsigned long : 18; + } src_y_t; + +typedef union { + unsigned long val : 32; + src_y_t f; +} src_y_u; + +typedef struct _src_x_y_t { + unsigned long src_y : 14; + unsigned long : 2; + unsigned long src_x : 14; + unsigned long : 2; + } src_x_y_t; + +typedef union { + unsigned long val : 32; + src_x_y_t f; +} src_x_y_u; + +typedef struct _src_y_x_t { + unsigned long src_x : 14; + unsigned long : 2; + unsigned long src_y : 14; + unsigned long : 2; + } src_y_x_t; + +typedef union { + unsigned long val : 32; + src_y_x_t f; +} src_y_x_u; + +typedef struct _src_width_t { + unsigned long src_width : 14; + unsigned long : 18; + } src_width_t; + +typedef union { + unsigned long val : 32; + src_width_t f; +} src_width_u; + +typedef struct _src_height_t { + unsigned long src_height : 14; + unsigned long : 18; + } src_height_t; + +typedef union { + unsigned long val : 32; + src_height_t f; +} src_height_u; + +typedef struct _src_inc_t { + unsigned long src_xinc : 6; + unsigned long : 2; + unsigned long src_yinc : 6; + unsigned long : 18; + } src_inc_t; + +typedef union { + unsigned long val : 32; + src_inc_t f; +} src_inc_u; + +typedef struct _host_data0_t { + unsigned long host_data : 32; + } host_data0_t; + +typedef union { + unsigned long val : 32; + host_data0_t f; +} host_data0_u; + +typedef struct _host_data1_t { + unsigned long host_data : 32; + } host_data1_t; + +typedef union { + unsigned long val : 32; + host_data1_t f; +} host_data1_u; + +typedef struct _host_data2_t { + unsigned long host_data : 32; + } host_data2_t; + +typedef union { + unsigned long val : 32; + host_data2_t f; +} host_data2_u; + +typedef struct _host_data3_t { + unsigned long host_data : 32; + } host_data3_t; + +typedef union { + unsigned long val : 32; + host_data3_t f; +} host_data3_u; + +typedef struct _host_data4_t { + unsigned long host_data : 32; + } host_data4_t; + +typedef union { + unsigned long val : 32; + host_data4_t f; +} host_data4_u; + +typedef struct _host_data5_t { + unsigned long host_data : 32; + } host_data5_t; + +typedef union { + unsigned long val : 32; + host_data5_t f; +} host_data5_u; + +typedef struct _host_data6_t { + unsigned long host_data : 32; + } host_data6_t; + +typedef union { + unsigned long val : 32; + host_data6_t f; +} host_data6_u; + +typedef struct _host_data7_t { + unsigned long host_data : 32; + } host_data7_t; + +typedef union { + unsigned long val : 32; + host_data7_t f; +} host_data7_u; + +typedef struct _host_data_last_t { + unsigned long host_data_last : 32; + } host_data_last_t; + +typedef union { + unsigned long val : 32; + host_data_last_t f; +} host_data_last_u; + +typedef struct _dp_src_frgd_clr_t { + unsigned long dp_src_frgd_clr : 32; + } dp_src_frgd_clr_t; + +typedef union { + unsigned long val : 32; + dp_src_frgd_clr_t f; +} dp_src_frgd_clr_u; + +typedef struct _dp_src_bkgd_clr_t { + unsigned long dp_src_bkgd_clr : 32; + } dp_src_bkgd_clr_t; + +typedef union { + unsigned long val : 32; + dp_src_bkgd_clr_t f; +} dp_src_bkgd_clr_u; + +typedef struct _sc_left_t { + unsigned long sc_left : 14; + unsigned long : 18; + } sc_left_t; + +typedef union { + unsigned long val : 32; + sc_left_t f; +} sc_left_u; + +typedef struct _sc_right_t { + unsigned long sc_right : 14; + unsigned long : 18; + } sc_right_t; + +typedef union { + unsigned long val : 32; + sc_right_t f; +} sc_right_u; + +typedef struct _sc_top_t { + unsigned long sc_top : 14; + unsigned long : 18; + } sc_top_t; + +typedef union { + unsigned long val : 32; + sc_top_t f; +} sc_top_u; + +typedef struct _sc_bottom_t { + unsigned long sc_bottom : 14; + unsigned long : 18; + } sc_bottom_t; + +typedef union { + unsigned long val : 32; + sc_bottom_t f; +} sc_bottom_u; + +typedef struct _src_sc_right_t { + unsigned long sc_right : 14; + unsigned long : 18; + } src_sc_right_t; + +typedef union { + unsigned long val : 32; + src_sc_right_t f; +} src_sc_right_u; + +typedef struct _src_sc_bottom_t { + unsigned long sc_bottom : 14; + unsigned long : 18; + } src_sc_bottom_t; + +typedef union { + unsigned long val : 32; + src_sc_bottom_t f; +} src_sc_bottom_u; + +typedef struct _dp_cntl_t { + unsigned long dst_x_dir : 1; + unsigned long dst_y_dir : 1; + unsigned long src_x_dir : 1; + unsigned long src_y_dir : 1; + unsigned long dst_major_x : 1; + unsigned long src_major_x : 1; + unsigned long : 26; + } dp_cntl_t; + +typedef union { + unsigned long val : 32; + dp_cntl_t f; +} dp_cntl_u; + +typedef struct _dp_cntl_dst_dir_t { + unsigned long : 15; + unsigned long dst_y_dir : 1; + unsigned long : 15; + unsigned long dst_x_dir : 1; + } dp_cntl_dst_dir_t; + +typedef union { + unsigned long val : 32; + dp_cntl_dst_dir_t f; +} dp_cntl_dst_dir_u; + +typedef struct _dp_datatype_t { + unsigned long dp_dst_datatype : 4; + unsigned long : 4; + unsigned long dp_brush_datatype : 4; + unsigned long dp_src2_type : 1; + unsigned long dp_src2_datatype : 3; + unsigned long dp_src_datatype : 3; + unsigned long : 11; + unsigned long dp_byte_pix_order : 1; + unsigned long : 1; + } dp_datatype_t; + +typedef union { + unsigned long val : 32; + dp_datatype_t f; +} dp_datatype_u; + +typedef struct _dp_mix_t { + unsigned long : 8; + unsigned long dp_src_source : 3; + unsigned long dp_src2_source : 3; + unsigned long : 2; + unsigned long dp_rop3 : 8; + unsigned long dp_op : 1; + unsigned long : 7; + } dp_mix_t; + +typedef union { + unsigned long val : 32; + dp_mix_t f; +} dp_mix_u; + +typedef struct _dp_write_msk_t { + unsigned long dp_write_msk : 32; + } dp_write_msk_t; + +typedef union { + unsigned long val : 32; + dp_write_msk_t f; +} dp_write_msk_u; + +typedef struct _clr_cmp_clr_src_t { + unsigned long clr_cmp_clr_src : 32; + } clr_cmp_clr_src_t; + +typedef union { + unsigned long val : 32; + clr_cmp_clr_src_t f; +} clr_cmp_clr_src_u; + +typedef struct _clr_cmp_clr_dst_t { + unsigned long clr_cmp_clr_dst : 32; + } clr_cmp_clr_dst_t; + +typedef union { + unsigned long val : 32; + clr_cmp_clr_dst_t f; +} clr_cmp_clr_dst_u; + +typedef struct _clr_cmp_cntl_t { + unsigned long clr_cmp_fcn_src : 3; + unsigned long : 5; + unsigned long clr_cmp_fcn_dst : 3; + unsigned long : 13; + unsigned long clr_cmp_src : 2; + unsigned long : 6; + } clr_cmp_cntl_t; + +typedef union { + unsigned long val : 32; + clr_cmp_cntl_t f; +} clr_cmp_cntl_u; + +typedef struct _clr_cmp_msk_t { + unsigned long clr_cmp_msk : 32; + } clr_cmp_msk_t; + +typedef union { + unsigned long val : 32; + clr_cmp_msk_t f; +} clr_cmp_msk_u; + +typedef struct _default_pitch_offset_t { + unsigned long default_offset : 20; + unsigned long default_pitch : 10; + unsigned long : 2; + } default_pitch_offset_t; + +typedef union { + unsigned long val : 32; + default_pitch_offset_t f; +} default_pitch_offset_u; + +typedef struct _default_sc_bottom_right_t { + unsigned long default_sc_right : 14; + unsigned long : 2; + unsigned long default_sc_bottom : 14; + unsigned long : 2; + } default_sc_bottom_right_t; + +typedef union { + unsigned long val : 32; + default_sc_bottom_right_t f; +} default_sc_bottom_right_u; + +typedef struct _default2_sc_bottom_right_t { + unsigned long default_sc_right : 14; + unsigned long : 2; + unsigned long default_sc_bottom : 14; + unsigned long : 2; + } default2_sc_bottom_right_t; + +typedef union { + unsigned long val : 32; + default2_sc_bottom_right_t f; +} default2_sc_bottom_right_u; + +typedef struct _ref1_pitch_offset_t { + unsigned long offset : 20; + unsigned long : 2; + unsigned long pitch : 8; + unsigned long : 2; + } ref1_pitch_offset_t; + +typedef union { + unsigned long val : 32; + ref1_pitch_offset_t f; +} ref1_pitch_offset_u; + +typedef struct _ref2_pitch_offset_t { + unsigned long offset : 20; + unsigned long : 2; + unsigned long pitch : 8; + unsigned long : 2; + } ref2_pitch_offset_t; + +typedef union { + unsigned long val : 32; + ref2_pitch_offset_t f; +} ref2_pitch_offset_u; + +typedef struct _ref3_pitch_offset_t { + unsigned long offset : 20; + unsigned long : 2; + unsigned long pitch : 8; + unsigned long : 2; + } ref3_pitch_offset_t; + +typedef union { + unsigned long val : 32; + ref3_pitch_offset_t f; +} ref3_pitch_offset_u; + +typedef struct _ref4_pitch_offset_t { + unsigned long offset : 20; + unsigned long : 2; + unsigned long pitch : 8; + unsigned long : 2; + } ref4_pitch_offset_t; + +typedef union { + unsigned long val : 32; + ref4_pitch_offset_t f; +} ref4_pitch_offset_u; + +typedef struct _ref5_pitch_offset_t { + unsigned long offset : 20; + unsigned long : 2; + unsigned long pitch : 8; + unsigned long : 2; + } ref5_pitch_offset_t; + +typedef union { + unsigned long val : 32; + ref5_pitch_offset_t f; +} ref5_pitch_offset_u; + +typedef struct _ref6_pitch_offset_t { + unsigned long offset : 20; + unsigned long : 2; + unsigned long pitch : 8; + unsigned long : 2; + } ref6_pitch_offset_t; + +typedef union { + unsigned long val : 32; + ref6_pitch_offset_t f; +} ref6_pitch_offset_u; + +typedef struct _dp_gui_master_cntl_t { + unsigned long gmc_src_pitch_offset_cntl : 1; + unsigned long gmc_dst_pitch_offset_cntl : 1; + unsigned long gmc_src_clipping : 1; + unsigned long gmc_dst_clipping : 1; + unsigned long gmc_brush_datatype : 4; + unsigned long gmc_dst_datatype : 4; + unsigned long gmc_src_datatype : 3; + unsigned long gmc_byte_pix_order : 1; + unsigned long gmc_default_sel : 1; + unsigned long gmc_rop3 : 8; + unsigned long gmc_dp_src_source : 3; + unsigned long gmc_clr_cmp_fcn_dis : 1; + unsigned long : 1; + unsigned long gmc_wr_msk_dis : 1; + unsigned long gmc_dp_op : 1; + } dp_gui_master_cntl_t; + +typedef union { + unsigned long val : 32; + dp_gui_master_cntl_t f; +} dp_gui_master_cntl_u; + +typedef struct _sc_top_left_t { + unsigned long sc_left : 14; + unsigned long : 2; + unsigned long sc_top : 14; + unsigned long : 2; + } sc_top_left_t; + +typedef union { + unsigned long val : 32; + sc_top_left_t f; +} sc_top_left_u; + +typedef struct _sc_bottom_right_t { + unsigned long sc_right : 14; + unsigned long : 2; + unsigned long sc_bottom : 14; + unsigned long : 2; + } sc_bottom_right_t; + +typedef union { + unsigned long val : 32; + sc_bottom_right_t f; +} sc_bottom_right_u; + +typedef struct _src_sc_bottom_right_t { + unsigned long sc_right : 14; + unsigned long : 2; + unsigned long sc_bottom : 14; + unsigned long : 2; + } src_sc_bottom_right_t; + +typedef union { + unsigned long val : 32; + src_sc_bottom_right_t f; +} src_sc_bottom_right_u; + +typedef struct _global_alpha_t { + unsigned long alpha_r : 8; + unsigned long alpha_g : 8; + unsigned long alpha_b : 8; + unsigned long alpha_a : 8; + } global_alpha_t; + +typedef union { + unsigned long val : 32; + global_alpha_t f; +} global_alpha_u; + +typedef struct _filter_coef_t { + unsigned long c_4 : 4; + unsigned long c_3 : 4; + unsigned long c_2 : 4; + unsigned long c_1 : 4; + unsigned long c1 : 4; + unsigned long c2 : 4; + unsigned long c3 : 4; + unsigned long c4 : 4; + } filter_coef_t; + +typedef union { + unsigned long val : 32; + filter_coef_t f; +} filter_coef_u; + +typedef struct _mvc_cntl_start_t { + unsigned long mc_cntl_src_1_index : 4; + unsigned long mc_cntl_dst_offset : 20; + unsigned long mc_dst_pitch_mul : 2; + unsigned long mc_cntl_src_2_index : 3; + unsigned long mc_cntl_width_height_sel : 3; + } mvc_cntl_start_t; + +typedef union { + unsigned long val : 32; + mvc_cntl_start_t f; +} mvc_cntl_start_u; + +typedef struct _e2_arithmetic_cntl_t { + unsigned long opcode : 5; + unsigned long shiftright : 4; + unsigned long clamp : 1; + unsigned long rounding : 2; + unsigned long filter_n : 3; + unsigned long : 1; + unsigned long srcblend_inv : 1; + unsigned long srcblend : 4; + unsigned long : 3; + unsigned long dstblend_inv : 1; + unsigned long dstblend : 4; + unsigned long dst_signed : 1; + unsigned long autoinc : 1; + unsigned long : 1; + } e2_arithmetic_cntl_t; + +typedef union { + unsigned long val : 32; + e2_arithmetic_cntl_t f; +} e2_arithmetic_cntl_u; + +typedef struct _debug0_t { + unsigned long debug0_r : 8; + unsigned long : 8; + unsigned long debug0_rw : 8; + unsigned long : 8; + } debug0_t; + +typedef union { + unsigned long val : 32; + debug0_t f; +} debug0_u; + +typedef struct _debug1_t { + unsigned long debug1_r : 8; + unsigned long : 8; + unsigned long debug1_rw : 8; + unsigned long : 8; + } debug1_t; + +typedef union { + unsigned long val : 32; + debug1_t f; +} debug1_u; + +typedef struct _debug2_t { + unsigned long debug2_r : 8; + unsigned long : 8; + unsigned long debug2_rw : 8; + unsigned long : 8; + } debug2_t; + +typedef union { + unsigned long val : 32; + debug2_t f; +} debug2_u; + +typedef struct _debug3_t { + unsigned long : 32; + } debug3_t; + +typedef union { + unsigned long val : 32; + debug3_t f; +} debug3_u; + +typedef struct _debug4_t { + unsigned long : 32; + } debug4_t; + +typedef union { + unsigned long val : 32; + debug4_t f; +} debug4_u; + +typedef struct _debug5_t { + unsigned long : 32; + } debug5_t; + +typedef union { + unsigned long val : 32; + debug5_t f; +} debug5_u; + +typedef struct _debug6_t { + unsigned long : 32; + } debug6_t; + +typedef union { + unsigned long val : 32; + debug6_t f; +} debug6_u; + +typedef struct _debug7_t { + unsigned long : 32; + } debug7_t; + +typedef union { + unsigned long val : 32; + debug7_t f; +} debug7_u; + +typedef struct _debug8_t { + unsigned long : 32; + } debug8_t; + +typedef union { + unsigned long val : 32; + debug8_t f; +} debug8_u; + +typedef struct _debug9_t { + unsigned long : 32; + } debug9_t; + +typedef union { + unsigned long val : 32; + debug9_t f; +} debug9_u; + +typedef struct _debug10_t { + unsigned long : 32; + } debug10_t; + +typedef union { + unsigned long val : 32; + debug10_t f; +} debug10_u; + +typedef struct _debug11_t { + unsigned long : 32; + } debug11_t; + +typedef union { + unsigned long val : 32; + debug11_t f; +} debug11_u; + +typedef struct _debug12_t { + unsigned long : 32; + } debug12_t; + +typedef union { + unsigned long val : 32; + debug12_t f; +} debug12_u; + +typedef struct _debug13_t { + unsigned long : 32; + } debug13_t; + +typedef union { + unsigned long val : 32; + debug13_t f; +} debug13_u; + +typedef struct _debug14_t { + unsigned long : 32; + } debug14_t; + +typedef union { + unsigned long val : 32; + debug14_t f; +} debug14_u; + +typedef struct _debug15_t { + unsigned long : 32; + } debug15_t; + +typedef union { + unsigned long val : 32; + debug15_t f; +} debug15_u; + +typedef struct _eng_cntl_t { + unsigned long erc_reg_rd_ws : 1; + unsigned long erc_reg_wr_ws : 1; + unsigned long erc_idle_reg_wr : 1; + unsigned long dis_engine_triggers : 1; + unsigned long dis_rop_src_uses_dst_w_h : 1; + unsigned long dis_src_uses_dst_dirmaj : 1; + unsigned long : 6; + unsigned long force_3dclk_when_2dclk : 1; + unsigned long : 19; + } eng_cntl_t; + +typedef union { + unsigned long val : 32; + eng_cntl_t f; +} eng_cntl_u; + +typedef struct _eng_perf_cnt_t { + unsigned long perf_cnt : 20; + unsigned long perf_sel : 4; + unsigned long perf_en : 1; + unsigned long : 3; + unsigned long perf_clr : 1; + unsigned long : 3; + } eng_perf_cnt_t; + +typedef union { + unsigned long val : 32; + eng_perf_cnt_t f; +} eng_perf_cnt_u; + +typedef struct _idct_runs_t { + unsigned long idct_runs_3 : 8; + unsigned long idct_runs_2 : 8; + unsigned long idct_runs_1 : 8; + unsigned long idct_runs_0 : 8; + } idct_runs_t; + +typedef union { + unsigned long val : 32; + idct_runs_t f; +} idct_runs_u; + +typedef struct _idct_levels_t { + unsigned long idct_level_hi : 16; + unsigned long idct_level_lo : 16; + } idct_levels_t; + +typedef union { + unsigned long val : 32; + idct_levels_t f; +} idct_levels_u; + +typedef struct _idct_control_t { + unsigned long idct_ctl_luma_rd_format : 2; + unsigned long idct_ctl_chroma_rd_format : 2; + unsigned long idct_ctl_scan_pattern : 1; + unsigned long idct_ctl_intra : 1; + unsigned long idct_ctl_flush : 1; + unsigned long idct_ctl_passthru : 1; + unsigned long idct_ctl_sw_reset : 1; + unsigned long idct_ctl_constreq : 1; + unsigned long idct_ctl_scramble : 1; + unsigned long idct_ctl_alt_scan : 1; + unsigned long : 20; + } idct_control_t; + +typedef union { + unsigned long val : 32; + idct_control_t f; +} idct_control_u; + +typedef struct _idct_auth_control_t { + unsigned long control_bits : 32; + } idct_auth_control_t; + +typedef union { + unsigned long val : 32; + idct_auth_control_t f; +} idct_auth_control_u; + +typedef struct _idct_auth_t { + unsigned long auth : 32; + } idct_auth_t; + +typedef union { + unsigned long val : 32; + idct_auth_t f; +} idct_auth_u; + +typedef struct _mem_cntl_t { + unsigned long : 1; + unsigned long en_mem_ch1 : 1; + unsigned long en_mem_ch2 : 1; + unsigned long int_mem_mapping : 1; + unsigned long : 28; + } mem_cntl_t; + +typedef union { + unsigned long val : 32; + mem_cntl_t f; +} mem_cntl_u; + +typedef struct _mem_arb_t { + unsigned long disp_time_slot : 4; + unsigned long disp_timer : 4; + unsigned long arb_option : 1; + unsigned long : 23; + } mem_arb_t; + +typedef union { + unsigned long val : 32; + mem_arb_t f; +} mem_arb_u; + +typedef struct _mc_fb_location_t { + unsigned long mc_fb_start : 16; + unsigned long mc_fb_top : 16; + } mc_fb_location_t; + +typedef union { + unsigned long val : 32; + mc_fb_location_t f; +} mc_fb_location_u; + +typedef struct _mem_ext_cntl_t { + unsigned long mem_ext_enable : 1; + unsigned long mem_ap_enable : 1; + unsigned long mem_addr_mapping : 2; + unsigned long mem_wdoe_cntl : 2; + unsigned long mem_wdoe_extend : 1; + unsigned long : 1; + unsigned long mem_page_timer : 8; + unsigned long mem_dynamic_cke : 1; + unsigned long mem_sdram_tri_en : 1; + unsigned long mem_self_refresh_en : 1; + unsigned long mem_power_down : 1; + unsigned long mem_hw_power_down_en : 1; + unsigned long mem_power_down_stat : 1; + unsigned long : 3; + unsigned long mem_pd_mck : 1; + unsigned long mem_pd_ma : 1; + unsigned long mem_pd_mdq : 1; + unsigned long mem_tristate_mck : 1; + unsigned long mem_tristate_ma : 1; + unsigned long mem_tristate_mcke : 1; + unsigned long mem_invert_mck : 1; + } mem_ext_cntl_t; + +typedef union { + unsigned long val : 32; + mem_ext_cntl_t f; +} mem_ext_cntl_u; + +typedef struct _mc_ext_mem_location_t { + unsigned long mc_ext_mem_start : 16; + unsigned long mc_ext_mem_top : 16; + } mc_ext_mem_location_t; + +typedef union { + unsigned long val : 32; + mc_ext_mem_location_t f; +} mc_ext_mem_location_u; + +typedef struct _mem_ext_timing_cntl_t { + unsigned long mem_trp : 2; + unsigned long mem_trcd : 2; + unsigned long mem_tras : 3; + unsigned long : 1; + unsigned long mem_trrd : 2; + unsigned long mem_tr2w : 2; + unsigned long mem_twr : 2; + unsigned long : 4; + unsigned long mem_twr_mode : 1; + unsigned long : 1; + unsigned long mem_refresh_dis : 1; + unsigned long : 3; + unsigned long mem_refresh_rate : 8; + } mem_ext_timing_cntl_t; + +typedef union { + unsigned long val : 32; + mem_ext_timing_cntl_t f; +} mem_ext_timing_cntl_u; + +typedef struct _mem_sdram_mode_reg_t { + unsigned long mem_mode_reg : 14; + unsigned long : 2; + unsigned long mem_read_latency : 2; + unsigned long mem_schmen_latency : 2; + unsigned long mem_cas_latency : 2; + unsigned long mem_schmen_extend : 1; + unsigned long : 8; + unsigned long mem_sdram_reset : 1; + } mem_sdram_mode_reg_t; + +typedef union { + unsigned long val : 32; + mem_sdram_mode_reg_t f; +} mem_sdram_mode_reg_u; + +typedef struct _mem_io_cntl_t { + unsigned long mem_sn_mck : 4; + unsigned long mem_sn_ma : 4; + unsigned long mem_sn_mdq : 4; + unsigned long mem_srn_mck : 1; + unsigned long mem_srn_ma : 1; + unsigned long mem_srn_mdq : 1; + unsigned long : 1; + unsigned long mem_sp_mck : 4; + unsigned long mem_sp_ma : 4; + unsigned long mem_sp_mdq : 4; + unsigned long mem_srp_mck : 1; + unsigned long mem_srp_ma : 1; + unsigned long mem_srp_mdq : 1; + unsigned long : 1; + } mem_io_cntl_t; + +typedef union { + unsigned long val : 32; + mem_io_cntl_t f; +} mem_io_cntl_u; + +typedef struct _mc_debug_t { + unsigned long mc_debug : 32; + } mc_debug_t; + +typedef union { + unsigned long val : 32; + mc_debug_t f; +} mc_debug_u; + +typedef struct _mc_bist_ctrl_t { + unsigned long mc_bist_ctrl : 32; + } mc_bist_ctrl_t; + +typedef union { + unsigned long val : 32; + mc_bist_ctrl_t f; +} mc_bist_ctrl_u; + +typedef struct _mc_bist_collar_read_t { + unsigned long mc_bist_collar_read : 32; + } mc_bist_collar_read_t; + +typedef union { + unsigned long val : 32; + mc_bist_collar_read_t f; +} mc_bist_collar_read_u; + +typedef struct _tc_mismatch_t { + unsigned long tc_mismatch : 24; + unsigned long : 8; + } tc_mismatch_t; + +typedef union { + unsigned long val : 32; + tc_mismatch_t f; +} tc_mismatch_u; + +typedef struct _mc_perf_mon_cntl_t { + unsigned long clr_perf : 1; + unsigned long en_perf : 1; + unsigned long : 2; + unsigned long perf_op_a : 2; + unsigned long perf_op_b : 2; + unsigned long : 8; + unsigned long monitor_period : 8; + unsigned long perf_count_a_overflow : 1; + unsigned long perf_count_b_overflow : 1; + unsigned long : 6; + } mc_perf_mon_cntl_t; + +typedef union { + unsigned long val : 32; + mc_perf_mon_cntl_t f; +} mc_perf_mon_cntl_u; + +typedef struct _mc_perf_counters_t { + unsigned long mc_perf_counter_a : 16; + unsigned long mc_perf_counter_b : 16; + } mc_perf_counters_t; + +typedef union { + unsigned long val : 32; + mc_perf_counters_t f; +} mc_perf_counters_u; + +typedef struct _wait_until_t { + unsigned long wait_crtc_pflip : 1; + unsigned long wait_re_crtc_vline : 1; + unsigned long wait_fe_crtc_vline : 1; + unsigned long wait_crtc_vline : 1; + unsigned long wait_dma_viph0_idle : 1; + unsigned long wait_dma_viph1_idle : 1; + unsigned long wait_dma_viph2_idle : 1; + unsigned long wait_dma_viph3_idle : 1; + unsigned long wait_dma_vid_idle : 1; + unsigned long wait_dma_gui_idle : 1; + unsigned long wait_cmdfifo : 1; + unsigned long wait_ov0_flip : 1; + unsigned long wait_ov0_slicedone : 1; + unsigned long : 1; + unsigned long wait_2d_idle : 1; + unsigned long wait_3d_idle : 1; + unsigned long wait_2d_idleclean : 1; + unsigned long wait_3d_idleclean : 1; + unsigned long wait_host_idleclean : 1; + unsigned long wait_extern_sig : 1; + unsigned long cmdfifo_entries : 7; + unsigned long : 3; + unsigned long wait_both_crtc_pflip : 1; + unsigned long eng_display_select : 1; + } wait_until_t; + +typedef union { + unsigned long val : 32; + wait_until_t f; +} wait_until_u; + +typedef struct _isync_cntl_t { + unsigned long isync_any2d_idle3d : 1; + unsigned long isync_any3d_idle2d : 1; + unsigned long isync_trig2d_idle3d : 1; + unsigned long isync_trig3d_idle2d : 1; + unsigned long isync_wait_idlegui : 1; + unsigned long isync_cpscratch_idlegui : 1; + unsigned long : 26; + } isync_cntl_t; + +typedef union { + unsigned long val : 32; + isync_cntl_t f; +} isync_cntl_u; + +typedef struct _rbbm_guicntl_t { + unsigned long host_data_swap : 2; + unsigned long : 30; + } rbbm_guicntl_t; + +typedef union { + unsigned long val : 32; + rbbm_guicntl_t f; +} rbbm_guicntl_u; + +typedef struct _rbbm_status_t { + unsigned long cmdfifo_avail : 7; + unsigned long : 1; + unsigned long hirq_on_rbb : 1; + unsigned long cprq_on_rbb : 1; + unsigned long cfrq_on_rbb : 1; + unsigned long hirq_in_rtbuf : 1; + unsigned long cprq_in_rtbuf : 1; + unsigned long cfrq_in_rtbuf : 1; + unsigned long cf_pipe_busy : 1; + unsigned long eng_ev_busy : 1; + unsigned long cp_cmdstrm_busy : 1; + unsigned long e2_busy : 1; + unsigned long rb2d_busy : 1; + unsigned long rb3d_busy : 1; + unsigned long se_busy : 1; + unsigned long re_busy : 1; + unsigned long tam_busy : 1; + unsigned long tdm_busy : 1; + unsigned long pb_busy : 1; + unsigned long : 6; + unsigned long gui_active : 1; + } rbbm_status_t; + +typedef union { + unsigned long val : 32; + rbbm_status_t f; +} rbbm_status_u; + +typedef struct _rbbm_cntl_t { + unsigned long rb_settle : 4; + unsigned long abortclks_hi : 3; + unsigned long : 1; + unsigned long abortclks_cp : 3; + unsigned long : 1; + unsigned long abortclks_cfifo : 3; + unsigned long : 2; + unsigned long cpq_data_swap : 1; + unsigned long : 3; + unsigned long no_abort_idct : 1; + unsigned long no_abort_bios : 1; + unsigned long no_abort_fb : 1; + unsigned long no_abort_cp : 1; + unsigned long no_abort_hi : 1; + unsigned long no_abort_hdp : 1; + unsigned long no_abort_mc : 1; + unsigned long no_abort_aic : 1; + unsigned long no_abort_vip : 1; + unsigned long no_abort_disp : 1; + unsigned long no_abort_cg : 1; + } rbbm_cntl_t; + +typedef union { + unsigned long val : 32; + rbbm_cntl_t f; +} rbbm_cntl_u; + +typedef struct _rbbm_soft_reset_t { + unsigned long soft_reset_cp : 1; + unsigned long soft_reset_hi : 1; + unsigned long reserved3 : 3; + unsigned long soft_reset_e2 : 1; + unsigned long reserved2 : 2; + unsigned long soft_reset_mc : 1; + unsigned long reserved1 : 2; + unsigned long soft_reset_disp : 1; + unsigned long soft_reset_cg : 1; + unsigned long : 19; + } rbbm_soft_reset_t; + +typedef union { + unsigned long val : 32; + rbbm_soft_reset_t f; +} rbbm_soft_reset_u; + +typedef struct _nqwait_until_t { + unsigned long wait_gui_idle : 1; + unsigned long : 31; + } nqwait_until_t; + +typedef union { + unsigned long val : 32; + nqwait_until_t f; +} nqwait_until_u; + +typedef struct _rbbm_debug_t { + unsigned long rbbm_debug : 32; + } rbbm_debug_t; + +typedef union { + unsigned long val : 32; + rbbm_debug_t f; +} rbbm_debug_u; + +typedef struct _rbbm_cmdfifo_addr_t { + unsigned long cmdfifo_addr : 6; + unsigned long : 26; + } rbbm_cmdfifo_addr_t; + +typedef union { + unsigned long val : 32; + rbbm_cmdfifo_addr_t f; +} rbbm_cmdfifo_addr_u; + +typedef struct _rbbm_cmdfifo_datal_t { + unsigned long cmdfifo_datal : 32; + } rbbm_cmdfifo_datal_t; + +typedef union { + unsigned long val : 32; + rbbm_cmdfifo_datal_t f; +} rbbm_cmdfifo_datal_u; + +typedef struct _rbbm_cmdfifo_datah_t { + unsigned long cmdfifo_datah : 12; + unsigned long : 20; + } rbbm_cmdfifo_datah_t; + +typedef union { + unsigned long val : 32; + rbbm_cmdfifo_datah_t f; +} rbbm_cmdfifo_datah_u; + +typedef struct _rbbm_cmdfifo_stat_t { + unsigned long cmdfifo_rptr : 6; + unsigned long : 2; + unsigned long cmdfifo_wptr : 6; + unsigned long : 18; + } rbbm_cmdfifo_stat_t; + +typedef union { + unsigned long val : 32; + rbbm_cmdfifo_stat_t f; +} rbbm_cmdfifo_stat_u; + +typedef struct _clk_pin_cntl_t { + unsigned long osc_en : 1; + unsigned long osc_gain : 5; + unsigned long dont_use_xtalin : 1; + unsigned long xtalin_pm_en : 1; + unsigned long xtalin_dbl_en : 1; + unsigned long : 7; + unsigned long cg_debug : 16; + } clk_pin_cntl_t; + +typedef union { + unsigned long val : 32; + clk_pin_cntl_t f; +} clk_pin_cntl_u; + +typedef struct _pll_ref_fb_div_t { + unsigned long pll_ref_div : 4; + unsigned long : 4; + unsigned long pll_fb_div_int : 6; + unsigned long : 2; + unsigned long pll_fb_div_frac : 3; + unsigned long : 1; + unsigned long pll_reset_time : 4; + unsigned long pll_lock_time : 8; + } pll_ref_fb_div_t; + +typedef union { + unsigned long val : 32; + pll_ref_fb_div_t f; +} pll_ref_fb_div_u; + +typedef struct _pll_cntl_t { + unsigned long pll_pwdn : 1; + unsigned long pll_reset : 1; + unsigned long pll_pm_en : 1; + unsigned long pll_mode : 1; + unsigned long pll_refclk_sel : 1; + unsigned long pll_fbclk_sel : 1; + unsigned long pll_tcpoff : 1; + unsigned long pll_pcp : 3; + unsigned long pll_pvg : 3; + unsigned long pll_vcofr : 1; + unsigned long pll_ioffset : 2; + unsigned long pll_pecc_mode : 2; + unsigned long pll_pecc_scon : 2; + unsigned long pll_dactal : 4; + unsigned long pll_cp_clip : 2; + unsigned long pll_conf : 3; + unsigned long pll_mbctrl : 2; + unsigned long pll_ring_off : 1; + } pll_cntl_t; + +typedef union { + unsigned long val : 32; + pll_cntl_t f; +} pll_cntl_u; + +typedef struct _sclk_cntl_t { + unsigned long sclk_src_sel : 2; + unsigned long : 2; + unsigned long sclk_post_div_fast : 4; + unsigned long sclk_clkon_hys : 3; + unsigned long sclk_post_div_slow : 4; + unsigned long disp_cg_ok2switch_en : 1; + unsigned long sclk_force_reg : 1; + unsigned long sclk_force_disp : 1; + unsigned long sclk_force_mc : 1; + unsigned long sclk_force_extmc : 1; + unsigned long sclk_force_cp : 1; + unsigned long sclk_force_e2 : 1; + unsigned long sclk_force_e3 : 1; + unsigned long sclk_force_idct : 1; + unsigned long sclk_force_bist : 1; + unsigned long busy_extend_cp : 1; + unsigned long busy_extend_e2 : 1; + unsigned long busy_extend_e3 : 1; + unsigned long busy_extend_idct : 1; + unsigned long : 3; + } sclk_cntl_t; + +typedef union { + unsigned long val : 32; + sclk_cntl_t f; +} sclk_cntl_u; + +typedef struct _pclk_cntl_t { + unsigned long pclk_src_sel : 2; + unsigned long : 2; + unsigned long pclk_post_div : 4; + unsigned long : 8; + unsigned long pclk_force_disp : 1; + unsigned long : 15; + } pclk_cntl_t; + +typedef union { + unsigned long val : 32; + pclk_cntl_t f; +} pclk_cntl_u; + +typedef struct _clk_test_cntl_t { + unsigned long testclk_sel : 4; + unsigned long : 3; + unsigned long start_check_freq : 1; + unsigned long tstcount_rst : 1; + unsigned long : 15; + unsigned long test_count : 8; + } clk_test_cntl_t; + +typedef union { + unsigned long val : 32; + clk_test_cntl_t f; +} clk_test_cntl_u; + +typedef struct _pwrmgt_cntl_t { + unsigned long pwm_enable : 1; + unsigned long : 1; + unsigned long pwm_mode_req : 2; + unsigned long pwm_wakeup_cond : 2; + unsigned long pwm_fast_noml_hw_en : 1; + unsigned long pwm_noml_fast_hw_en : 1; + unsigned long pwm_fast_noml_cond : 4; + unsigned long pwm_noml_fast_cond : 4; + unsigned long pwm_idle_timer : 8; + unsigned long pwm_busy_timer : 8; + } pwrmgt_cntl_t; + +typedef union { + unsigned long val : 32; + pwrmgt_cntl_t f; +} pwrmgt_cntl_u; + +typedef struct _pwrmgt_status_t { + unsigned long pwm_mode : 2; + unsigned long : 30; + } pwrmgt_status_t; + +typedef union { + unsigned long val : 32; + pwrmgt_status_t f; +} pwrmgt_status_u; + +typedef struct tagDISPLAYSTATE { +lcd_format_u LcdFormat; +crtc_total_u CrtcTotal; +active_h_disp_u ActiveHDisp; +active_v_disp_u ActiveVDisp; +crtc_ss_u CrtcSS; +crtc_ls_u CrtcLS; +crtc_gs_u CrtcGS; +crtc_vpos_gs_u CrtcVPosGS; +crtc_gclk_u CrtcGClk; +crtc_goe_u CrtcGOE; +crtc_rev_u CrtcRev; +crtc_dclk_u CrtcDClk; +crtc_default_count_u CrtcDefaultCount; +crtc_frame_u CrtcFrame; +crtc_frame_vpos_u CrtcFrameVPos; +lcdd_cntl1_u LcddCntl1; +lcdd_cntl2_u LcddCntl2; +genlcd_cntl1_u GenlcdCntl1; +genlcd_cntl2_u GenlcdCntl2; +lcd_background_color_u LcdBackgroundColor; +brightness_cntl_u Brightness_Cntl; +} DISPLAYSTATE; + +typedef struct { +s16 X_Top_Left; // x coordinate of top left corner +s16 Y_Top_Left; // y coordinate of top left corner +s16 X_Bottom_Right; // x coordinate of bottom right corner +s16 Y_Bottom_Right; // y coordinate of bottom right corner +} ATI_CLIPRECT; + +typedef struct tagGUISTATE { +dp_cntl_u DpCntl; +dp_gui_master_cntl_u GMC; +e2_arithmetic_cntl_u E2AC; +global_alpha_u GlobalAlpha; +dst_pitch_u dstPitch; +dst_offset_u dstOffset; +src_pitch_u srcPitch; +src_offset_u srcOffset; +u32 FrgrdColour; +u32 BkgrdColour; +ATI_CLIPRECT SrcClipRect; +ATI_CLIPRECT DstClipRect; +u32 BrushOffset; +u16 BrushHandle; +// for 16bpp, SRC must be the same type as DST, can't go from 1555->565 +s8 TurnOnDst565ForNon2D; +} GUISTATE; + +typedef struct tagGFXWINSTATE { +graphic_ctrl_u GraphicCtrl; +graphic_offset_u GraphicOffset; +graphic_pitch_u GraphicPitch; // byte-based +graphic_h_disp_u GraphicHDisp; +graphic_v_disp_u GraphicVDisp; +s8 TurnOnDisp565; +// These memory offsets need to be translated before writing to registers +u32 Grp_Offset; +u32 Grp_W; +u32 Grp_H; +u32 Grp_Src_X; +u32 Grp_Src_Y; +u32 Grp_Src_W; // pixel-based +} GFXWINSTATE; + +typedef struct tagPREVSTATE { +u16 PrevOverlayX; +u16 PrevOverlayY; +u8 bOverlayWasOn; +u16 PrevGfxWinX; +u16 PrevGfxWinY; +u8 bGfxWinWasOn; +} PREVSTATE; + +typedef struct tagPOWERSTATE { +clk_pin_cntl_u ClkPinCntl; +pll_ref_fb_div_u PllRefFbDiv; +pll_cntl_u PllCntl; +sclk_cntl_u SclkCntl; +pclk_cntl_u PclkCntl; +clk_test_cntl_u ClkTestCntl; +pwrmgt_cntl_u PwrmgtCntl; +u32 Freq; +u8 tf100; +u8 tf80; +u8 tf20; +u8 M; +u8 N_int; +u8 N_fac; +u8 lock_time; +u8 tfgoal; +u8 AutoMode; +u8 PWMMode; +u16 FastSclk; +u16 NormSclk; +PREVSTATE PrevState; +} POWERSTATE; + +typedef struct tagAPERTURE { +u32 MMRegBase; +u32 CfgRegBase; +u32 McFbStart; +u32 McFbTop; +u32 McExtMemStart; +u32 McExtMemTop; +u32 WrapStart; +u32 WrapTop; +} APERTURE; + +#endif + diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch b/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch new file mode 100644 index 0000000000..01899556d3 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch @@ -0,0 +1,10 @@ +--- mplayer_20060519/Makefile.orig 2006-05-30 10:29:18.000000000 +0100 ++++ mplayer_20060519/Makefile 2006-05-30 10:29:53.000000000 +0100 +@@ -74,6 +74,7 @@ + $(DIRECTFB_LIB) \ + $(CACA_LIB) \ + $(VESA_LIB) \ ++ $(W100_LIB) + + ifeq ($(EXTERNAL_VIDIX),yes) + VO_LIBS += $(EXTERNAL_VIDIX_LIB) diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch b/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch new file mode 100644 index 0000000000..03610610e4 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch @@ -0,0 +1,53 @@ +--- mplayer_20060519/configure.orig 2006-05-30 10:23:24.000000000 +0100 ++++ mplayer_20060519/configure 2006-05-30 10:27:24.000000000 +0100 +@@ -1585,6 +1585,7 @@ + _svga=auto + _vesa=auto + _fbdev=auto ++_w100=no + _dvb=auto + _dvbhead=auto + _dxr2=auto +@@ -1767,6 +1768,8 @@ + --disable-vesa) _vesa=no ;; + --enable-fbdev) _fbdev=yes ;; + --disable-fbdev) _fbdev=no ;; ++ --enable-w100) _w100=yes ;; ++ --disable-w100) _w100=no ;; + --enable-dvb) _dvb=yes ;; + --disable-dvb) _dvb=no ;; + --enable-dvbhead) _dvbhead=yes ;; +@@ -4200,6 +4203,17 @@ + fi + echores "$_fbdev" + ++echocheck "ATI Imageon 100 (w100)" ++if test "$_w100" = yes ; then ++ _def_w100='#define HAVE_W100 1' ++ _ld_w100='-laticore' ++ _vosrc="$_vosrc vo_w100.c" ++ _vomodules="w100 $_vomodules" ++else ++ _def_w100='#undef HAVE_W100' ++ _novomodules="w100 $_novomodules" ++fi ++echores "$_w100" + + + echocheck "DVB" +@@ -7441,6 +7455,7 @@ + AA_LIB = $_ld_aa + CACA_INC = $_inc_caca + CACA_LIB = $_ld_caca ++W100_LIB = $_ld_w100 + + # audio output + ALSA_LIB = $_ld_alsa +@@ -8238,6 +8253,7 @@ + $_def_xmga + $_def_syncfb + $_def_fbdev ++$_def_w100 + $_def_dxr2 + $_def_dxr3 + $_def_dvb diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch b/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch new file mode 100644 index 0000000000..4bed6326d1 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch @@ -0,0 +1,31 @@ +--- mplayer_20060519/mplayer.c.orig 2006-05-30 12:31:01.000000000 +0100 ++++ mplayer_20060519/mplayer.c 2006-05-30 12:33:41.000000000 +0100 +@@ -628,6 +628,18 @@ + exit_player(NULL); + } + ++//w100 driver additions ++int g_sigcont = 0; ++ ++static void misc_sighandler(int x){ ++ switch(x){ ++ case SIGCONT: ++ ++ g_sigcont; ++ break; ++ } ++} ++ ++ + //extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height); + + extern void mp_input_register_options(m_config_t* cfg); +@@ -2732,6 +2744,9 @@ + #endif + #endif + ++// w100 driver additions ++ signal(SIGCONT,misc_sighandler); ++ + #ifdef HAVE_NEW_GUI + if(use_gui){ + guiInit(); diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch b/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch new file mode 100644 index 0000000000..9855853fe6 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch @@ -0,0 +1,20 @@ +--- mplayer_20060519/libvo/video_out.c.orig 2006-05-30 11:25:57.000000000 +0100 ++++ mplayer_20060519/libvo/video_out.c 2006-05-30 11:26:49.000000000 +0100 +@@ -86,6 +86,7 @@ + extern vo_functions_t video_out_syncfb; + extern vo_functions_t video_out_fbdev; + extern vo_functions_t video_out_fbdev2; ++extern vo_functions_t video_out_w100; + extern vo_functions_t video_out_svga; + extern vo_functions_t video_out_png; + extern vo_functions_t video_out_ggi; +@@ -196,6 +197,9 @@ + &video_out_fbdev, + &video_out_fbdev2, + #endif ++#ifdef HAVE_W100 ++ &video_out_w100, ++#endif + #ifdef HAVE_SVGALIB + &video_out_svga, + #endif diff --git a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb b/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb new file mode 100644 index 0000000000..9298f0645c --- /dev/null +++ b/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb @@ -0,0 +1,73 @@ +DESCRIPTION = "Open Source multimedia player." +SECTION = "opie/multimedia" +PRIORITY = "optional" +HOMEPAGE = "http://www.mplayerhq.hu/" +DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common" +RDEPENDS = "mplayer-common" +LICENSE = "GPL" +SRC_URI = "http://www.xora.org.uk/oe/mplayer_20060519.tar.bz2 \ + http://www.xora.org.uk/oe/ffmpeg_20060519.tar.bz2 \ + file://vo_w100.c \ + file://vo_w100_api.h \ + file://vo_w100_fb.h \ + file://Makefile.patch;patch=1 \ + file://w100-configure.patch;patch=1 \ + file://w100-Makefile.patch;patch=1 \ + file://w100-video_out.patch;patch=1 \ + file://w100-mplayer.patch;patch=1" + +MAINTAINER="Graeme Gregory " +RCONFLICTS_${PN} = "mplayer-atty" +RREPLACES_${PN} = "mplayer-atty" +PR = "r0" + +PARALLEL_MAKE = "" + +DEPENDS_append_c7x0 = " sharp-aticore-oss" + +S = "${WORKDIR}/mplayer_20060519" + +PACKAGES =+ "mencoder" + +FILES_${PN} = "${bindir}/mplayer" +FILES_mencoder = "${bindir}/mencoder" + +inherit autotools + +EXTRA_OECONF = " \ + --prefix=/usr \ + --mandir=${mandir} \ + --target=${TARGET_SYS} \ + \ + --enable-mencoder \ + --disable-gui \ + --enable-largefiles \ + --disable-linux-devfs \ + --disable-lirc \ + --disable-lircc \ + --disable-tv \ + --enable-rtc \ + --disable-smb \ + --disable-win32 \ + \ + --enable-tremor-low \ + --disable-mp3lib \ + \ + --disable-x11 \ + --enable-sdl \ + --enable-fbdev " + +EXTRA_OECONF_append_c7x0 = " --enable-w100 " + +do_configure() { + cp -r ${WORKDIR}/ffmpeg_20060519/libavcodec ${WORKDIR}/ffmpeg_20060519/libavutil ${WORKDIR}/ffmpeg_20060519/libavformat ${S} + cp ${WORKDIR}/vo_w100.c ${S}/libvo + cp ${WORKDIR}/vo_w100_api.h ${S}/libvo + cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo + ./configure ${EXTRA_OECONF} +} + +do_compile () { + oe_runmake +} + -- cgit v1.2.3 From 135dd94094b635ef1a3e7935c4d9d5ca0204698b Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 30 May 2006 13:56:36 +0000 Subject: sylpheed_2.2.5.bb : new version --- packages/sylpheed/sylpheed_2.2.5.bb | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 packages/sylpheed/sylpheed_2.2.5.bb diff --git a/packages/sylpheed/sylpheed_2.2.5.bb b/packages/sylpheed/sylpheed_2.2.5.bb new file mode 100644 index 0000000000..1a1656e539 --- /dev/null +++ b/packages/sylpheed/sylpheed_2.2.5.bb @@ -0,0 +1,33 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent" +DEPENDS = "gtk+ gpgme gnutls" +MAINTAINER = "Graeme Gregory " +LICENSE = "GPL" +PR = "r5" + +SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \ + file://sylpheed-2.2.2-libsylph-Makefile-am.patch;patch=1 \ + file://sylpheed-2.2.2-src-Makefile-am.patch;patch=1 \ + file://sylpheed-gnutls_2.2.4.patch;patch=1" + + +FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" +FILES_${PN}-doc += "${datadir}" + +EXTRA_OECONF = "--enable-gnutls --disable-pthread" + +CFLAGS += "-D_GNU_SOURCE" + +do_configure_prepend() { + mkdir -p m4 +} + +inherit autotools + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps + install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ +} + -- cgit v1.2.3 From a8c0cfd39c545a5aec874b8ef7e0837f6b7d8f38 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 30 May 2006 14:18:47 +0000 Subject: gpe-today_cvs.bb, libgpevtype_cvs.bb : fix ${PV} to latest version+cvs --- packages/gpe-today/gpe-today_cvs.bb | 2 +- packages/libgpevtype/libgpevtype_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gpe-today/gpe-today_cvs.bb b/packages/gpe-today/gpe-today_cvs.bb index 33af763f07..47e9c01a66 100644 --- a/packages/gpe-today/gpe-today_cvs.bb +++ b/packages/gpe-today/gpe-today_cvs.bb @@ -8,7 +8,7 @@ PRIORITY = "optional" S = "${WORKDIR}/${PN}" #Remove the dash below when 0.10 changes in PV -PV = "0.10+cvs-${SRCDATE}" +PV = "0.11+cvs-${SRCDATE}" PR = "r0" inherit gpe diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_cvs.bb index 301cb37a5e..31c900dd7e 100644 --- a/packages/libgpevtype/libgpevtype_cvs.bb +++ b/packages/libgpevtype/libgpevtype_cvs.bb @@ -8,7 +8,7 @@ DEPENDS = "libmimedir" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.16+cvs${SRCDATE}" +PV = "0.17+cvs${SRCDATE}" PR = "r0" inherit pkgconfig gpe autotools -- cgit v1.2.3 From 57fbd1ab5141c0ec39dd59cea888b6432e20485a Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Tue, 30 May 2006 14:19:30 +0000 Subject: wget 1.9.1: Disable checking for the SSL headers so that it doesn't attempt to search the system include directories. Closes bug #1031. --- packages/wget/wget_1.9.1.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/wget/wget_1.9.1.bb b/packages/wget/wget_1.9.1.bb index ec1f00d4ad..8521655477 100644 --- a/packages/wget/wget_1.9.1.bb +++ b/packages/wget/wget_1.9.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more." SECTION = "console/network" MAINTAINER = "Chris Larson " DEPENDS = "" -PR = "r4" +PR = "r5" LICENSE = "GPL" SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ @@ -19,6 +19,9 @@ EXTRA_OECONF_unslung = "" # SlugOS kernels do not support ipv6. Can be loaded as a module. EXTRA_OECONF_slugos = "" +# Disable checking for SSL since that searches the system paths +EXTRA_OECONF += "--without-ssl" + do_configure () { if [ ! -e acinclude.m4 ]; then mv aclocal.m4 acinclude.m4 -- cgit v1.2.3 From 60e2025f5746f412aef7ab75edc13cba3f30faf4 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 30 May 2006 14:23:09 +0000 Subject: sylpheed_2.2.5.bb : remove accidental test change. --- packages/sylpheed/sylpheed_2.2.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sylpheed/sylpheed_2.2.5.bb b/packages/sylpheed/sylpheed_2.2.5.bb index 1a1656e539..315f46ea86 100644 --- a/packages/sylpheed/sylpheed_2.2.5.bb +++ b/packages/sylpheed/sylpheed_2.2.5.bb @@ -14,7 +14,7 @@ SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \ FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" FILES_${PN}-doc += "${datadir}" -EXTRA_OECONF = "--enable-gnutls --disable-pthread" +EXTRA_OECONF = "--enable-gnutls" CFLAGS += "-D_GNU_SOURCE" -- cgit v1.2.3 From cb32f8279d0c252cbadfe969cd612bcbd5966add Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Tue, 30 May 2006 14:41:52 +0000 Subject: glibc 2.3.5+cvs20050627: Revert sh fix from bug #954 again to get sh4 to build again. No effect on sh3 (or other arch) but gets sh4 to build. Closes bug #954. --- packages/glibc/glibc_2.3.5+cvs20050627.bb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 024ba1d901..ff434d2a1b 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -90,11 +90,6 @@ do_munge() { # Integrate ports into tree mv ${WORKDIR}/ports ${S} - # Need to copy some extra folder content for sh arch. - OE bug #954 - case ${TARGET_ARCH} in - sh*) cp ${WORKDIR}/libc/sysdeps/sh/${TARGET_ARCH}/*.S ${WORKDIR}/libc/sysdeps/sh;; - esac - # http://www.handhelds.org/hypermail/oe/51/5135.html # Some files were moved around between directories on # 2005-12-21, which means that any attempt to check out -- cgit v1.2.3 From 2211bf20b22959ede40362acbbc071387ef9b256 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Tue, 30 May 2006 14:46:28 +0000 Subject: ckermit 211: Fix for uclibc by disabling arrow key checking, which in turn prevents it from trying to peek inside the stdio implementation which is what was breaking it. --- packages/ckermit/ckermit_211.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/ckermit/ckermit_211.bb b/packages/ckermit/ckermit_211.bb index 9bf4c2859e..9a89c9fbbf 100644 --- a/packages/ckermit/ckermit_211.bb +++ b/packages/ckermit/ckermit_211.bb @@ -8,6 +8,7 @@ MAINTAINER = "Holger Schurig" HOMEPAGE = "http://www.columbia.edu/kermit/" SECTION = "console/network" SRC_URI = "ftp://kermit.columbia.edu/kermit/archives/cku${PV}.tar.gz" +PR = "r1" # # From http://www.columbia.edu/kermit/ck80.html#license @@ -63,6 +64,11 @@ export BINDIR = "${bindir}" export MANDIR = "${mandir}/man1" export INFODIR = "${infodir}" +# Additional flags. For uclibc we add -DNOARROWKEYS which stops ckermit +# trying to look inside the stdio headers. +CKERMIT_ADDITIONAL = "" +CKERMIT_ADDITIONAL_linux-uclibc = "-DNOARROWKEYS" + do_compile () { # The original makefile doesn't differentiate between CC and CC_FOR_BUILD, # so we build wart manually. Note that you need a ckwart.o with the proper @@ -83,7 +89,8 @@ do_compile () { -DNOSERVER -DNOSEXP -DNORLOGIN -DNOOLDMODEMS -DNOSSH -DNOLISTEN \ -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \ -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \ - -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI" + -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \ + ${CKERMIT_ADDITIONAL}" } do_install () { -- cgit v1.2.3 From 4ec55c36751931e262662d5b418b7d5bc9fe21a8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 30 May 2006 20:41:25 +0000 Subject: libmatchbox: Add missing patch --- packages/libmatchbox/files/16bppfixes.patch | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 packages/libmatchbox/files/16bppfixes.patch diff --git a/packages/libmatchbox/files/16bppfixes.patch b/packages/libmatchbox/files/16bppfixes.patch new file mode 100644 index 0000000000..09a0347809 --- /dev/null +++ b/packages/libmatchbox/files/16bppfixes.patch @@ -0,0 +1,36 @@ +Index: libmb/mbpixbuf.c +=================================================================== +--- libmatchbox/libmb.orig/mbpixbuf.c 2006-02-01 12:45:55.000000000 +0000 ++++ libmatchbox/libmb/mbpixbuf.c 2006-03-11 15:20:47.000000000 +0000 +@@ -716,7 +716,13 @@ + case 15: + return ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); + case 16: +- return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); ++ switch (pb->byte_order) ++ { ++ case BYTE_ORD_24_RGB: ++ return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); ++ case BYTE_ORD_24_BGR: ++ return ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3); ++ } + case 24: + case 32: + switch (pb->byte_order) +@@ -1880,12 +1886,11 @@ + for(y=0; yheight; y++) + for(x=0; xwidth; x++) + { +- /* Below is potentially dangerous. +- */ +- pixel = ( *p | (*(p+1) << 8)); ++ internal_16bpp_pixel_to_rgb(p, r, g, b); ++ internal_16bpp_pixel_next(p); ++ a = ((img->has_alpha) ? *p++ : 0xff); + +- p += ((img->has_alpha) ? 3 : 2); +- ++ pixel = mb_pixbuf_get_pixel(pb, r, g, b, a); + XPutPixel(img->ximg, x, y, pixel); + } + } -- cgit v1.2.3 From a578015e0055199c526ba641dd7035949df78820 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 30 May 2006 22:56:58 +0000 Subject: kernel.bbclass: Add a postinstall for kernel-image to make sure the corrrect /lib/modules directory exists and to run depmod. This removes modprobe errors when no kernel modules are installed. --- classes/kernel.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index ab8c03014f..ad51c4e035 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -192,6 +192,17 @@ PKG_kernel-image = "kernel-image-${KERNEL_VERSION}" ALLOW_EMPTY_kernel = "1" ALLOW_EMPTY_kernel-image = "1" +pkg_postinst_kernel-image () { +if [ ! -e "$D/lib/modules/${KERNEL_RELEASE}" ]; then + mkdir -p $D/lib/modules/${KERNEL_RELEASE} +fi +if [ -n "$D" ]; then + ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION} +else + depmod -A +fi +} + pkg_postinst_modules () { if [ -n "$D" ]; then ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION} -- cgit v1.2.3 From 8938bf09e6a8642d7843dc036486c888c99ea5d5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 30 May 2006 22:58:14 +0000 Subject: Add Matchbox Applet Volume --- packages/matchbox-applet-volume/.mtn2git_empty | 0 .../matchbox-applet-volume/matchbox-applet-volume_0.1.bb | 12 ++++++++++++ 2 files changed, 12 insertions(+) create mode 100644 packages/matchbox-applet-volume/.mtn2git_empty create mode 100644 packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb diff --git a/packages/matchbox-applet-volume/.mtn2git_empty b/packages/matchbox-applet-volume/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb b/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb new file mode 100644 index 0000000000..61b4756059 --- /dev/null +++ b/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Matchbox Volume Applet" +LICENSE = "GPL" +DEPENDS = "matchbox-wm libmatchbox" +SECTION = "x11/wm" + +SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-volume/${PV}/mb-applet-volume-${PV}.tar.gz" +S = "${WORKDIR}/mb-applet-volume-${PV}" + +inherit autotools pkgconfig + +FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps" + -- cgit v1.2.3 From 07321325c869378445800aff2546ad0f2121fd05 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 31 May 2006 01:12:34 +0000 Subject: librsync 0.9.7; Add librsync - a library that implements the rsync remote-delta algorithm. Closes bug # 1032. --- packages/librsync/.mtn2git_empty | 0 packages/librsync/librsync_0.9.7.bb | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 packages/librsync/.mtn2git_empty create mode 100644 packages/librsync/librsync_0.9.7.bb diff --git a/packages/librsync/.mtn2git_empty b/packages/librsync/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/librsync/librsync_0.9.7.bb b/packages/librsync/librsync_0.9.7.bb new file mode 100644 index 0000000000..eb8bb2671c --- /dev/null +++ b/packages/librsync/librsync_0.9.7.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "librsync is a free software library that implements the rsync \ +remote-delta algorithm. This algorithm allows efficient remote updates of a \ +file, without requiring the old and new versions to both be present at the \ +sending end." +HOMEPAGE = "http://librsync.sourceforge.net/" +SECTION = "libs" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/librsync/librsync-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-build-docs --enable-shared " + +do_stage() { + oe_libinstall -a -so -C .libs librsync ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/ + for i in librsync.h librsync-config.h + do + install -m 0644 ${S}/$i ${STAGING_INCDIR}/$i + done +} -- cgit v1.2.3 From 4e2b7163de91a98c6558dcf7efd4962eaa6a6c1a Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 31 May 2006 01:16:27 +0000 Subject: rdiff-backup: Add rdiff-backup 1.0.4 (stable) and 1.1.5 (dev). A backup program that uses rsync and supports storage/retrieval of old revisions and is able to preserve all file informatin (including extended attributes and ACLs). Closes bug# 1033. --- packages/rdiff-backup/.mtn2git_empty | 0 packages/rdiff-backup/rdiff-backup.inc | 41 +++++++++++++++++++++++++++++ packages/rdiff-backup/rdiff-backup_1.0.4.bb | 2 ++ packages/rdiff-backup/rdiff-backup_1.1.5.bb | 5 ++++ 4 files changed, 48 insertions(+) create mode 100644 packages/rdiff-backup/.mtn2git_empty create mode 100644 packages/rdiff-backup/rdiff-backup.inc create mode 100644 packages/rdiff-backup/rdiff-backup_1.0.4.bb create mode 100644 packages/rdiff-backup/rdiff-backup_1.1.5.bb diff --git a/packages/rdiff-backup/.mtn2git_empty b/packages/rdiff-backup/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/rdiff-backup/rdiff-backup.inc b/packages/rdiff-backup/rdiff-backup.inc new file mode 100644 index 0000000000..73d2f7db72 --- /dev/null +++ b/packages/rdiff-backup/rdiff-backup.inc @@ -0,0 +1,41 @@ +DESCRIPTION = "A python application that backs up one directory to \ +another, possibly over a network. It combines the best features of a \ +mirror and an incremental backup. The target directory ends up a copy \ +of the source directory, but extra reverse diffs are stored in a \ +special subdirectory of that target directory, so you can still \ +recover files lost some time ago. It is also able to preserve \ +subdirectories, hard links, dev files, permissions, uid/gid \ +ownership, modification times, extended attributes, acls, and \ +resource forks." +HOMEPAGE = "http://www.nongnu.org/rdiff-backup/" +SECTION = "network" +LICENSE = "GPL" +DEPENDS = "librsync" +RDEPENDS_${PN} = "zlib python-re python-io python-lang python-datetime \ + python-pickle python-shell python-compression python-unixadmin \ + python-netclient" + +SRC_URI = "http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-${PV}.tar.gz" + +inherit distutils + +# +# Without this the python interpreter path points to the staging area. +# +do_compile() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR}/python setup.py build --executable=${bindir}/python || \ + oefatal "python setup.py build execution failed." +} + +# +# The default do_install sets install-data to ${D}/${datadir} which +# ends up with documentation in /usr/share/share/... instead of +# /usr/share/... Modify the install data directory here to get it +# into the correct place. +# +do_install() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${prefix} || \ + oefatal "python setup.py install execution failed." +} diff --git a/packages/rdiff-backup/rdiff-backup_1.0.4.bb b/packages/rdiff-backup/rdiff-backup_1.0.4.bb new file mode 100644 index 0000000000..6cc6e28276 --- /dev/null +++ b/packages/rdiff-backup/rdiff-backup_1.0.4.bb @@ -0,0 +1,2 @@ +include rdiff-backup.inc +PR = "r0" diff --git a/packages/rdiff-backup/rdiff-backup_1.1.5.bb b/packages/rdiff-backup/rdiff-backup_1.1.5.bb new file mode 100644 index 0000000000..99ddc95a9d --- /dev/null +++ b/packages/rdiff-backup/rdiff-backup_1.1.5.bb @@ -0,0 +1,5 @@ +include rdiff-backup.inc +PR = "r0" + +# 1.1.x added the use of sha which we get from python-crypt +RDEPENDS_${PN} += "python-crypt" -- cgit v1.2.3 From 00998321e079b586aa18ca0b63bb3aced8289bf8 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 31 May 2006 01:32:42 +0000 Subject: olsrd 0.4.10: Added version 0.4.10. Closes bug # 902. --- packages/olsrd/olsrd_0.4.10.bb | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 packages/olsrd/olsrd_0.4.10.bb diff --git a/packages/olsrd/olsrd_0.4.10.bb b/packages/olsrd/olsrd_0.4.10.bb new file mode 100644 index 0000000000..6a7463936c --- /dev/null +++ b/packages/olsrd/olsrd_0.4.10.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "OLSR mesh routing daemon" +HOMEPAGE = "http://www.olsr.org" +DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon - optional libraries" +MAINTAINER = "Bruno Randolf " +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "BSD" +RDEPENDS_olsrd = "olsrd-libs" +PR = "r0" + +SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \ + file://init \ + file://olsrd.conf" + + +PACKAGES =+ "olsrd-libs" +FILES_olsrd-libs = "${libdir}" + +S = "${WORKDIR}/olsrd-${PV}" + +inherit update-rc.d + +INITSCRIPT_NAME = "olsrd" +INITSCRIPT_PARAMS = "defaults" +EXTRA_OEMAKE="MAKEFLAGS=-I${WORKDIR}/olsrd-${PV}" + +do_configure() { + oe_runmake OS=linux clean +} + +do_compile() { + + oe_runmake +} + +do_install () { + oe_runmake OS=linux INSTALL_PREFIX=${D} install install_libs + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd + install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir} +} + +CONFFILES_${PN} = "${sysconfdir}/olsrd.conf" -- cgit v1.2.3 From b9a2fdbb3af27771cba38d98381b05f50746d552 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 31 May 2006 01:47:04 +0000 Subject: olsrd: Moved the common parts of recipes for 0.4.9 and 0.4.10 into a seperate .inc file. --- packages/olsrd/olsrd.inc | 41 ++++++++++++++++++++++++++++++++++++++ packages/olsrd/olsrd_0.4.10.bb | 45 ++---------------------------------------- packages/olsrd/olsrd_0.4.9.bb | 39 +++--------------------------------- 3 files changed, 46 insertions(+), 79 deletions(-) create mode 100644 packages/olsrd/olsrd.inc diff --git a/packages/olsrd/olsrd.inc b/packages/olsrd/olsrd.inc new file mode 100644 index 0000000000..bd511961cb --- /dev/null +++ b/packages/olsrd/olsrd.inc @@ -0,0 +1,41 @@ +DESCRIPTION = "OLSR mesh routing daemon" +HOMEPAGE = "http://www.olsr.org" +DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon - optional libraries" +MAINTAINER = "Bruno Randolf " +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "BSD" +RDEPENDS_olsrd = "olsrd-libs" + +SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \ + file://init \ + file://olsrd.conf" + +PACKAGES =+ "olsrd-libs" +FILES_olsrd-libs = "${libdir}" + +S = "${WORKDIR}/olsrd-${PV}" + +inherit update-rc.d + +INITSCRIPT_NAME = "olsrd" +INITSCRIPT_PARAMS = "defaults" +EXTRA_OEMAKE="MAKEFLAGS=-I${WORKDIR}/olsrd-${PV}" + + +do_configure() { + oe_runmake OS=linux clean +} + +do_compile() { + oe_runmake +} + +do_install () { + oe_runmake OS=linux INSTALL_PREFIX=${D} install install_libs + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd + install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir} +} + +CONFFILES_${PN} = "${sysconfdir}/olsrd.conf" diff --git a/packages/olsrd/olsrd_0.4.10.bb b/packages/olsrd/olsrd_0.4.10.bb index 6a7463936c..4f4f70cbe3 100644 --- a/packages/olsrd/olsrd_0.4.10.bb +++ b/packages/olsrd/olsrd_0.4.10.bb @@ -1,43 +1,2 @@ -DESCRIPTION = "OLSR mesh routing daemon" -HOMEPAGE = "http://www.olsr.org" -DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon - optional libraries" -MAINTAINER = "Bruno Randolf " -SECTION = "console/network" -PRIORITY = "optional" -LICENSE = "BSD" -RDEPENDS_olsrd = "olsrd-libs" -PR = "r0" - -SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \ - file://init \ - file://olsrd.conf" - - -PACKAGES =+ "olsrd-libs" -FILES_olsrd-libs = "${libdir}" - -S = "${WORKDIR}/olsrd-${PV}" - -inherit update-rc.d - -INITSCRIPT_NAME = "olsrd" -INITSCRIPT_PARAMS = "defaults" -EXTRA_OEMAKE="MAKEFLAGS=-I${WORKDIR}/olsrd-${PV}" - -do_configure() { - oe_runmake OS=linux clean -} - -do_compile() { - - oe_runmake -} - -do_install () { - oe_runmake OS=linux INSTALL_PREFIX=${D} install install_libs - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd - install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir} -} - -CONFFILES_${PN} = "${sysconfdir}/olsrd.conf" +include olsrd.inc +PR = "r1" diff --git a/packages/olsrd/olsrd_0.4.9.bb b/packages/olsrd/olsrd_0.4.9.bb index 2fd3cecb4a..80e790d3df 100644 --- a/packages/olsrd/olsrd_0.4.9.bb +++ b/packages/olsrd/olsrd_0.4.9.bb @@ -1,31 +1,7 @@ -DESCRIPTION = "OLSR mesh routing daemon" -HOMEPAGE = "http://www.olsr.org" -DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon - optional libraries" -MAINTAINER = "Bruno Randolf " -SECTION = "console/network" -PRIORITY = "optional" -LICENSE = "BSD" -RDEPENDS_olsrd = "olsrd-libs" -PR = "r1" +include olsrd.inc +PR = "r2" -SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \ - file://0.4.9-httpinfo-makefile.diff;patch=1 \ - file://init \ - file://olsrd.conf" - -PACKAGES =+ "olsrd-libs" -FILES_olsrd-libs = "${libdir}" - -S = "${WORKDIR}/olsrd-${PV}" - -inherit update-rc.d - -INITSCRIPT_NAME = "olsrd" -INITSCRIPT_PARAMS = "defaults" - -do_configure() { - oe_runmake OS=linux clean -} +SRC_URI += "file://0.4.9-httpinfo-makefile.diff;patch=1" do_compile() { oe_runmake OS=linux clean @@ -33,12 +9,3 @@ do_compile() { touch src/cfgparser/.depend oe_runmake OS=linux all libs } - -do_install () { - oe_runmake OS=linux INSTALL_PREFIX=${D} install install_libs - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd - install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir} -} - -CONFFILES_${PN} = "${sysconfdir}/olsrd.conf" -- cgit v1.2.3 From 1e42b4d30cf60f6b546e4464e307ba5ee97a5fad Mon Sep 17 00:00:00 2001 From: Jonathan McDowell Date: Wed, 31 May 2006 07:29:32 +0000 Subject: amsdelta: Limit size of ext2 images to 8M so we can use them as an initrd. --- conf/machine/amsdelta.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf index 193048ae52..443b70c5de 100644 --- a/conf/machine/amsdelta.conf +++ b/conf/machine/amsdelta.conf @@ -23,4 +23,6 @@ PREFERRED_VERSION_u-boot = 1.1.4 TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" +IMAGE_ROOTFS_SIZE_ext2 = "8192" +IMAGE_ROOTFS_SIZE_ext2.gz = "8192" IMAGE_FSTYPES = "ext2.gz tar.bz2" -- cgit v1.2.3 From 08aab5d13004100d91d4014f416ef8dd077d118c Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 31 May 2006 09:49:03 +0000 Subject: gimp_2.3.8.bb : fix configure.in so it is possible to disable libwmf with a --without-libwmf argument. --- packages/gimp/files/.mtn2git_empty | 0 packages/gimp/files/configure-libwmf.patch | 21 +++++++++++++++++++++ packages/gimp/gimp_2.3.8.bb | 6 ++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 packages/gimp/files/.mtn2git_empty create mode 100644 packages/gimp/files/configure-libwmf.patch diff --git a/packages/gimp/files/.mtn2git_empty b/packages/gimp/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gimp/files/configure-libwmf.patch b/packages/gimp/files/configure-libwmf.patch new file mode 100644 index 0000000000..ca3697cfa2 --- /dev/null +++ b/packages/gimp/files/configure-libwmf.patch @@ -0,0 +1,21 @@ +--- gimp-2.3.8/configure.in.orig 2006-05-31 10:16:40.000000000 +0100 ++++ gimp-2.3.8/configure.in 2006-05-31 10:18:56.000000000 +0100 +@@ -1342,7 +1342,10 @@ + # Check for libwmf2 + ################### + ++AC_ARG_WITH(libwmf, [ --without-libwmf build without libwmf support]) ++ + have_libwmf=no ++if test "x$with_libwmf" != xno; then + AC_PATH_PROG(WMF_CONFIG, libwmf-config, no) + if test "x$WMF_CONFIG" != "xno" ; then + have_libwmf=yes +@@ -1359,6 +1362,7 @@ + else + have_libwmf="no (libwmf not found)" + fi ++fi + AC_SUBST(LIBWMF) + AC_SUBST(WMF_CFLAGS) + diff --git a/packages/gimp/gimp_2.3.8.bb b/packages/gimp/gimp_2.3.8.bb index 89d9be3e8d..84b35b1e8d 100644 --- a/packages/gimp/gimp_2.3.8.bb +++ b/packages/gimp/gimp_2.3.8.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://www.gimp.org" LICENSE = "GPL" MAINTAINER = "Koen Kooi " -SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ + file://configure-libwmf.patch;patch=1" DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff" @@ -12,7 +13,8 @@ inherit autotools pkgconfig EXTRA_OECONF = " --disable-gtktest \ --disable-print \ --disable-python \ - --enable-mp" + --enable-mp \ + --without-libwmf" do_configure_append() { find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g -- cgit v1.2.3 From a6e39080788cf30c6d71977fae4ca2bf1e7bde8c Mon Sep 17 00:00:00 2001 From: Jonathan McDowell Date: Wed, 31 May 2006 10:06:40 +0000 Subject: udev: Add mount blacklist for amsdelta. --- packages/udev/files/amsdelta/.mtn2git_empty | 0 packages/udev/files/amsdelta/mount.blacklist | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 packages/udev/files/amsdelta/.mtn2git_empty create mode 100644 packages/udev/files/amsdelta/mount.blacklist diff --git a/packages/udev/files/amsdelta/.mtn2git_empty b/packages/udev/files/amsdelta/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/udev/files/amsdelta/mount.blacklist b/packages/udev/files/amsdelta/mount.blacklist new file mode 100644 index 0000000000..7f43f17e41 --- /dev/null +++ b/packages/udev/files/amsdelta/mount.blacklist @@ -0,0 +1,6 @@ +# This is a grep pattern matched against the device name +# Any matched pattern will _not_ be mounted / removed by udevd + +/dev/mtdblock +/dev/loop +/dev/ram -- cgit v1.2.3