POST: replace the LOGBUFF_INITIALIZED flag in gd->post_log_word (1 << 31) with the...

[u-boot] / examples / mem_to_mem_idma2intr.c

diff --git a/examples/mem_to_mem_idma2intr.c b/examples/mem_to_mem_idma2intr.c
index 3f0fd372b0f20e115f9735d89de5caba280eafe9..3ff28041f81267bdf548a2a4b7fd062e8e59de5a 100644 (file)
--- a/examples/mem_to_mem_idma2intr.c
+++ b/examples/mem_to_mem_idma2intr.c
@@ -28,7 +28,9 @@
 
 
 #include <common.h>
-#include <syscall.h>
+#include <exports.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 #define STANDALONE
 
@@ -36,13 +38,6 @@
 #include <command.h>
 #include <watchdog.h>
 #else                                  /* Standalone app of PPCBoot */
-#include <syscall.h>
-#define printf mon_printf
-#define tstc   mon_tstc
-#define getc   mon_getc
-#define putc   mon_putc
-#define udelay mon_udelay
-#define malloc mon_malloc
 #define WATCHDOG_RESET() {                                             \
                        *(ushort *)(CFG_IMMR + 0x1000E) = 0x556c;       \
                        *(ushort *)(CFG_IMMR + 0x1000E) = 0xaa39;       \
@@ -180,8 +175,8 @@ uint dpinit_done = 0;
 #ifdef STANDALONE
 int ctrlc (void)
 {
-       if (mon_tstc()) {
-               switch (mon_getc ()) {
+       if (tstc()) {
+               switch (getc ()) {
                case 0x03:              /* ^C - Control C */
                        return 1;
                default:
@@ -209,19 +204,20 @@ int memcmp(const void * cs,const void * ct,size_t count)
 #endif /* STANDALONE */
 
 #ifdef STANDALONE
-int mem_to_mem_idma2intr (bd_t * bd, int argc, char *argv[])
+int mem_to_mem_idma2intr (int argc, char *argv[])
 #else
 int do_idma (bd_t * bd, int argc, char *argv[])
 #endif /* STANDALONE */
 {
        int i;
 
+       app_startup(argv);
        dpinit_done = 0;
 
        idma_init ();
 
        DEBUG ("Installing dma handler\n");
-       mon_install_hdlr (7, dmadone_handler, (void *) bdf);
+       install_hdlr (7, dmadone_handler, (void *) bdf);
 
        memset ((void *) 0x100000, 'a', 512);
        memset ((void *) 0x200000, 'b', 512);
@@ -232,7 +228,7 @@ int do_idma (bd_t * bd, int argc, char *argv[])
        }
 
        DEBUG ("Uninstalling dma handler\n");
-       mon_free_hdlr (7);
+       free_hdlr (7);
 
        return 0;
 }
@@ -352,8 +348,6 @@ static uint dpbase = 0;
 
 uint dpalloc (uint size, uint align)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        volatile immap_t *immr = (immap_t *) CFG_IMMR;
        uint retloc;
        uint align_mask, off;