Changeset 739 for soft

Timestamp:

Dec 3, 2015, 4:53:44 PM (8 years ago)

Author:

alain

Message:

Introduce the mjpeg application in the giet_vm Makefile.

Location:

soft/giet_vm

Files:

• Makefile (modified) (8 diffs)
• giet_config.h (modified) (2 diffs)

soft/giet_vm/Makefile

@@ -18 +18 @@
 FBF_WIDTH ?= 256
 IOC_TYPE  ?= BDV
+MWR_TYPE  ?= CPY
 APPLIS    ?= shell
 
@@ -30 +31 @@
                  applications/dhrystone/dhrystone.py    \
                  applications/gameoflife/gameoflife.py  \
+                 applications/mjpeg/mjpeg.py            \
                  applications/ocean/ocean.py            \
                  applications/raycast/raycast.py        \
@@ -188 +190 @@
         cd applications/dhrystone    && $(MAKE) clean && cd ../..
         cd applications/gameoflife   && $(MAKE) clean && cd ../..
+        cd applications/mjpeg        && $(MAKE) clean && cd ../..
         cd applications/ocean        && $(MAKE) clean && cd ../..
         cd applications/raycast      && $(MAKE) clean && cd ../..
@@ -213 +216 @@
         mmd -o -i $< ::/bin/display       || true
         mmd -o -i $< ::/bin/gameoflife    || true
+        mmd -o -i $< ::/bin/mjpeg         || true
         mmd -o -i $< ::/bin/ocean         || true
         mmd -o -i $< ::/bin/raycast       || true
@@ -229 +233 @@
         mcopy -o -i $< applications/display/appli.elf ::/bin/display          || true
         mcopy -o -i $< applications/gameoflife/appli.elf ::/bin/gameoflife    || true
+        mcopy -o -i $< applications/mjpeg/appli.elf ::/bin/mjpeg              || true
         mcopy -o -i $< applications/ocean/appli.elf ::/bin/ocean              || true
         mcopy -o -i $< applications/raycast/appli.elf ::/bin/raycast          || true
@@ -244 +249 @@
         mcopy -o -i $< images/rock_32.raw ::/misc
         mcopy -o -i $< images/wood_32.raw ::/misc
+        mcopy -o -i $< images/wood_32.raw ::/misc
+        mcopy -o -i $< images/plan_48.mjpg ::/misc
+        mcopy -o -i $< images/mandel_128.mjpg ::/misc
+        mcopy -o -i $< images/video_160_120.mjpg ::/misc
 
 #########################
@@ -266 +275 @@
                        --fbf=$(FBF_WIDTH) \
                        --ioc=$(IOC_TYPE)  \
+                       --mwr=$(MWR_TYPE)  \
                        --giet=.           \
                        $(GENMAP_APPLIS)   \
@@ -388 +398 @@
 
 ########################################
+### mjpeg  application compilation
+applications/mjpeg/appli.elf: build/libs/libuser.a
+        $(MAKE) -C applications/mjpeg
+
+########################################
 ### ocean  application compilation
 applications/ocean/appli.elf: build/libs/libmath.a  build/libs/libuser.a

soft/giet_vm/giet_config.h

@@ -44 +44 @@
 #define GIET_DEBUG_USER_LOCK      0            /* user locks access */
 
-#define CONFIG_SRL_VERBOSITY TRACE 
-
 /* software parameters */
 
@@ -58 +56 @@
 #define GIET_NIC_MAC2            0xBEBE        /* 16 MSB bits of the MAC address */
 #define GIET_ISR_TYPE_MAX        32            /* max number of ISR types */
-#define GIET_ISR_CHANNEL_MAX     8             /* max number of ISR channels */
+#define GIET_ISR_CHANNEL_MAX     16            /* max number of ISR channels */
 #define GIET_SDC_PERIOD          2             /* number of system cycles in SDC period */
 #define GIET_SR_INIT_VALUE       0x2000FF13    /* SR initial value (before eret) */