[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-204-g6634894

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  663489491607550291d1d6f795b74f6177786c56 (commit)
       via  a7dec9e324e48ed00960f1d170ca182601f4d289 (commit)
      from  1b1c16d8a95d2da379c26a736ba9865987a9e3ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 663489491607550291d1d6f795b74f6177786c56
Merge: a7dec9e324e48ed00960f1d170ca182601f4d289 1b1c16d8a95d2da379c26a736ba9865987a9e3ac
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Feb 18 11:34:49 2010 +0100

    Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit a7dec9e324e48ed00960f1d170ca182601f4d289
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Feb 18 11:33:41 2010 +0100

    [DEBUG] imxregs: differentiates both ULPI viewports on i.MX27

-----------------------------------------------------------------------

Summary of changes:
 target/linux/debug/imxregs/imx27regs.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/debug/imxregs/imx27regs.h b/target/linux/debug/imxregs/imx27regs.h
index c25d8c7..1361182 100644
--- a/target/linux/debug/imxregs/imx27regs.h
+++ b/target/linux/debug/imxregs/imx27regs.h
@@ -766,7 +766,7 @@ static struct reg_info regs[] =
 { "UOG_ASYNCLISTADDR",    0x10024158, 0, 0xffffffff, 'x', "Host Controller Next Asynch. Address" },
 { "UOG_BURSTSIZE",        0x10024160, 0, 0xffffffff, 'x', "Host Controller Embedded TT Asynch. Buffer" },
 { "UOG_TXFILLTUNING",     0x10024164, 0, 0xffffffff, 'x', "TX FIFO Fill Tuning (UOG_TXFILLTUNING)" },
-{ "ULPIVIEW",             0x10024170, 0, 0xffffffff, 'x', "ULPI Viewport (ULPIVIEW)" },
+{ "UOG_ULPIVIEW",         0x10024170, 0, 0xffffffff, 'x', "OTG ULPI Viewport (ULPIVIEW)" },
 { "UOG_CFGFLAG",          0x10024180, 0, 0xffffffff, 'x', "Config Flag (UOG_CFGFLAG)" },
 { "UOG_PORTSC1",          0x10024184, 0, 0xffffffff, 'x', "Port Status and Control (UOG_PORTSC1)" },
 { "UOG_OTGSC",            0x100241A4, 0, 0xffffffff, 'x', "On-The-Go Status and control (UOG_OTGSC)" },
@@ -831,7 +831,7 @@ static struct reg_info regs[] =
 { "UH2_ASYNCLISTADDR",    0x10024558, 0, 0xffffffff, 'x', "Host Controller Next Asynch. Address" },
 { "UH2_BURSTSIZE",        0x10024560, 0, 0xffffffff, 'x', "Host Controller Embedded TT Asynch. Buffer" },
 { "UH2_TXFILLTUNING",     0x10024564, 0, 0xffffffff, 'x', "TX FIFO Fill Tuning (UH2_TXFILLTUNING)" },
-{ "ULPIVIEW",             0x10024570, 0, 0xffffffff, 'x', "ULPI Viewport (ULPIVIEW)" },
+{ "UH2_ULPIVIEW",         0x10024570, 0, 0xffffffff, 'x', "Host2 ULPI Viewport (ULPIVIEW)" },
 { "Reserved",             0x10024580, 0, 0xffffffff, 'x', "" },
 { "UH2_PORTSC1",          0x10024584, 0, 0xffffffff, 'x', "Port Status and Control (UH2_PORTSC1)" },
 { "UH2_USBMODE",          0x100245A8, 0, 0xffffffff, 'x', "USB Device Mode (UH2_USBMODE)" },


hooks/post-receive
-- 
armadeus