Mercurial > ecos
changeset 1755:d61d51cfd8ab
Move parallel port initializations to platform code
| author | gthomas |
|---|---|
| date | Thu, 16 Sep 2004 23:23:54 +0000 |
| parents | 5650657d3c26 |
| children | b2a8f9509f6f |
| files | packages/hal/powerpc/adder/current/ChangeLog packages/hal/powerpc/adder/current/src/hal_aux.c packages/hal/powerpc/mpc8xx/current/ChangeLog packages/hal/powerpc/mpc8xx/current/src/var_misc.c |
| diffstat | 4 files changed, 27 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/hal/powerpc/adder/current/ChangeLog +++ b/packages/hal/powerpc/adder/current/ChangeLog @@ -1,3 +1,9 @@ +2004-09-16 Gary Thomas <gary@mlbassoc.com> + + * src/hal_aux.c (hal_platform_init): Move parallel port initializations + from variant here (comment says they are required re: errata, but no + supporting documentation is known) + 2003-12-21 Gary Thomas <gary@mlbassoc.com> * src/adder.S: Only clear caches on non-RAM startup modes. This fixes
--- a/packages/hal/powerpc/adder/current/src/hal_aux.c +++ b/packages/hal/powerpc/adder/current/src/hal_aux.c @@ -9,7 +9,7 @@ // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc. -// Copyright (C) 2002, 2003 Gary Thomas +// Copyright (C) 2002, 2003, 2004 Gary Thomas // // eCos 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 @@ -93,6 +93,20 @@ hal_platform_init(void) #endif #if defined(CYGHWR_HAL_POWERPC_ADDER_II) + +#if defined(CYGHWR_HAL_POWERPC_MPC8XX_852T) + // Special settings - according to manual errata + eppc->pio_papar &= ~0xffffffff; // PA manatory settings + eppc->pio_padir |= 0xffffffff; + + eppc->pip_pbpar &= ~0x0003ff07; // PB29..31 AS GPIO + eppc->pip_pbdir |= 0x0003ff07; + eppc->pip_pbdat = 0x00010007; + + eppc->pio_pcpar &= ~0xffffffff; // PC manatory settings + eppc->pio_pcdir |= 0xffffffff; +#endif + eppc->pip_pbpar &= ~0x00000007; // PB29..31 AS GPIO for LEDS eppc->pip_pbdir |= 0x00000007; eppc->pip_pbdat |= 0x00000007;
--- a/packages/hal/powerpc/mpc8xx/current/ChangeLog +++ b/packages/hal/powerpc/mpc8xx/current/ChangeLog @@ -1,3 +1,8 @@ +2004-09-16 Gary Thomas <gary@mlbassoc.com> + + * src/var_misc.c (hal_variant_init): Remove [possibly incorrect] + parallel port initializations - leave them to the platform. + 2004-04-22 Jani Monoses <jani@iv.ro> * cdl/hal_powerpc_mpc8xx.cdl :
--- a/packages/hal/powerpc/mpc8xx/current/src/var_misc.c +++ b/packages/hal/powerpc/mpc8xx/current/src/var_misc.c @@ -9,7 +9,7 @@ // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc. -// Copyright (C) 2002, 2003 Gary Thomas +// Copyright (C) 2002, 2003, 2004 Gary Thomas // // eCos 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 @@ -66,9 +66,6 @@ void hal_variant_init(void) { -#if defined(CYGHWR_HAL_POWERPC_MPC8XX_852T) - volatile EPPC *eppc = (volatile EPPC *)eppc_base(); -#endif // Disable serialization { cyg_uint32 ictrl; @@ -77,19 +74,6 @@ hal_variant_init(void) CYGARC_MTSPR (ICTRL, ictrl); } -#if defined(CYGHWR_HAL_POWERPC_MPC8XX_852T) - // Special settings - according to manual errata - eppc->pio_papar &= ~0xffffffff; // PA manatory settings - eppc->pio_padir |= 0xffffffff; - - eppc->pip_pbpar &= ~0x0003ff07; // PB29..31 AS GPIO - eppc->pip_pbdir |= 0x0003ff07; - eppc->pip_pbdat = 0x00010007; - - eppc->pio_pcpar &= ~0xffffffff; // PC manatory settings - eppc->pio_pcdir |= 0xffffffff; -#endif - #ifndef CYGSEM_HAL_USE_ROM_MONITOR // Reset CPM _mpc8xx_reset_cpm();