Code review changes to ensure ddr3_mem_test() picking up types.h definition

diff --git a/src/device/c66x/c66xutil.c b/src/device/c66x/c66xutil.c
index 1edf768a0a0a3d7a0834c64e1ceb44d8dd58d981..29cf7521a7d651bccbe47bffde6e5be81520da7c 100644 (file)
--- a/src/device/c66x/c66xutil.c
+++ b/src/device/c66x/c66xutil.c
@@ -8,12 +8,7 @@
 #include "device.h"
 #include "target.h"
 #include "pllapi.h"
-#include <string.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
+#include "types.h"
 
 /**
  *  @brief
@@ -142,19 +137,19 @@ int32 devicePowerPeriph (int32 modNum)
  */
 
 
-int32_t ddr3_memory_test (void)
+UINT32 ddr3_memory_test (void)
 {
-       uint32_t index, value;
+        UINT32 index, value;
 
        /* Write a pattern */
        for (index = DDR3_TEST_START_ADDRESS; index < DDR3_TEST_END_ADDRESS; index += 4) {
-               *(volatile uint32_t *) index = (uint32_t)index;
+               *(VUint32 *) index = (UINT32)index;
        }
 
        /* Read and check the pattern */
        for (index = DDR3_TEST_START_ADDRESS; index < DDR3_TEST_END_ADDRESS; index += 4) {
 
-               value = *(uint32_t *) index;
+               value = *(UINT32 *) index;
 
                if (value  != index) {
                        return -1;
@@ -163,13 +158,13 @@ int32_t ddr3_memory_test (void)
 
        /* Write a pattern for complementary values */
        for (index = DDR3_TEST_START_ADDRESS; index < DDR3_TEST_END_ADDRESS; index += 4) {
-               *(volatile uint32_t *) index = (uint32_t)~index;
+               *(VUint32 *) index = (UINT32)~index;
        }
 
        /* Read and check the pattern */
        for (index = DDR3_TEST_START_ADDRESS; index < DDR3_TEST_END_ADDRESS; index += 4) {
 
-               value = *(uint32_t *) index;
+               value = *(UINT32 *) index;
 
                if (value  != ~index) {
                        return -1;

diff --git a/src/device/c66x/target.h b/src/device/c66x/target.h
index 763207ff7dc019f01b63a66cc3d0fb9e2f3d5bdf..ed3018dc7e2ba15ff244275952f9ce50eb9d7d51 100644 (file)
--- a/src/device/c66x/target.h
+++ b/src/device/c66x/target.h
@@ -52,10 +52,6 @@
 #ifndef _TARGET_H
 #define _TARGET_H
 #include "types.h"
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 
  
 /** 
@@ -418,7 +414,7 @@ Int32 targetMacRcv (void *ptr_device, UINT8 *buffer);
  */
 #define PLL_REINIT_WORKAROUND
 
-extern int32_t ddr3_memory_test();
+UINT32 ddr3_memory_test();
 
 #endif /* _TARGET_H */