set to use uiomux_malloc() and uiomux_virt_to_phys()

kfish · Nov 9, 2009 · 864f444 · 864f444
1 parent 751438b
commit 864f444
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cntlfile/capture.c b/cntlfile/capture.c
@@ -360,8 +360,11 @@ static void init_userp(sh_ceu * ceu, unsigned int buffer_size)
     exit (EXIT_FAILURE);
   }
 
+#define USE_UIOMUX_MALLOC
   {
+#ifndef USE_UIOMUX_MALLOC
     unsigned char * veu_virt_base;
+#endif
 
     fprintf (stderr, "Initializing for buffer size %u\n", buffer_size);
 
@@ -376,7 +379,7 @@ static void init_userp(sh_ceu * ceu, unsigned int buffer_size)
 #ifndef USE_UIOMUX_MALLOC
       ceu->buffers[ceu->n_buffers].start = (unsigned char *)(veu_virt_base + (buffer_size*ceu->n_buffers));
 #else
-      ceu->buffers[ceu->n_buffers].start = uiomux_malloc (uiomux, UIOMUX_SH_VEU, buffer_size, 32);
+      ceu->buffers[ceu->n_buffers].start = uiomux_malloc (ceu->uiomux, UIOMUX_SH_VEU, buffer_size, 32);
 #endif
       if (!ceu->buffers[ceu->n_buffers].start) {
         fprintf (stderr, "Out of memory\n");

diff --git a/gstshvideocapenc.c b/gstshvideocapenc.c
@@ -232,7 +232,7 @@ static void *capture_thread(void *data)
   }
 }
 
-//#define USE_UIOMUX_VIRT_TO_PHYS
+#define USE_UIOMUX_VIRT_TO_PHYS
 
 static void *blit_thread(void *data)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -232,7 +232,7 @@ static void *capture_thread(void *data) @@
       }
     }
-    //#define USE_UIOMUX_VIRT_TO_PHYS
+    #define USE_UIOMUX_VIRT_TO_PHYS
     static void *blit_thread(void *data)
     {
@@ Expand Down @@