summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorJiaojinxing <jiaojinxing1987@gmail.com>2017-09-19 15:36:26 (GMT)
committer Jiaojinxing <jiaojinxing1987@gmail.com>2017-09-19 15:36:26 (GMT)
commitb70f30b909beb8010f338b3729e57d6d67cea1b5 (patch)
tree6aa68e4061d8fba5c3fa967205dc2e7c3c3daa03
parentf7bc2bc703c878d49ac45eeaf10c4bccb8c42353 (diff)
downloadbspam335x-b70f30b909beb8010f338b3729e57d6d67cea1b5.zip
bspam335x-b70f30b909beb8010f338b3729e57d6d67cea1b5.tar.gz
bspam335x-b70f30b909beb8010f338b3729e57d6d67cea1b5.tar.bz2
Removed macro BIT(x) definition.
-rw-r--r--.cproject9
-rw-r--r--.reproject2
-rw-r--r--SylixOS/StarterWare/include/armv7a/cache.h2
-rw-r--r--SylixOS/driver/memory/am335x_nand.h2
-rw-r--r--SylixOS/driver/memory/memory_config.h2
-rw-r--r--SylixOS/driver/memory/memory_port.h4
-rw-r--r--SylixOS/driver/pinmux/am335x_pinmux.h2
-rw-r--r--SylixOS/driver/pinmux/mux_port.c26
-rw-r--r--SylixOS/driver/pinmux/mux_port.h2
-rw-r--r--config.mk2
10 files changed, 13 insertions, 40 deletions
diff --git a/.cproject b/.cproject
index 58e6e4d..f2530fb 100644
--- a/.cproject
+++ b/.cproject
@@ -12,14 +12,15 @@
</cconfiguration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="refreshScope"/>
<storageModule moduleId="org.eclipse.cdt.core.pathentry">
<pathentry kind="mac" name="__GNUC__" path="" value="4"/>
<pathentry kind="mac" name="SYLIXOS" path="" value=""/>
<pathentry kind="mac" name="__arm__" path="" value=""/>
- <pathentry base-ref="bspam335x" include="D:/SylixOSDev/workspace/sylixos-base-a9/libsylixos/SylixOS" kind="inc" path="" system="true"/>
- <pathentry base-ref="bspam335x" include="D:/SylixOSDev/workspace/sylixos-base-a9/libsylixos/SylixOS/include" kind="inc" path="" system="true"/>
- <pathentry base-ref="bspam335x" include="D:/SylixOSDev/workspace/sylixos-base-a9/libsylixos/SylixOS/include/network" kind="inc" path="" system="true"/>
- <pathentry base-ref="bspam335x" include="D:/SylixOSDev/workspace/sylixos-base-a9/libcextern/libcextern/include" kind="inc" path="" system="true"/>
+ <pathentry base-ref="bspam335x" include="D:/SylixOSDev/workspace_arm/sylixos-base-a8/libsylixos/SylixOS" kind="inc" path="" system="true"/>
+ <pathentry base-ref="bspam335x" include="D:/SylixOSDev/workspace_arm/sylixos-base-a8/libsylixos/SylixOS/include" kind="inc" path="" system="true"/>
+ <pathentry base-ref="bspam335x" include="D:/SylixOSDev/workspace_arm/sylixos-base-a8/libsylixos/SylixOS/include/network" kind="inc" path="" system="true"/>
+ <pathentry base-ref="bspam335x" include="D:/SylixOSDev/workspace_arm/sylixos-base-a8/libcextern/libcextern/include" kind="inc" path="" system="true"/>
<pathentry base-ref="bspam335x" include="C:/ACOINFO/RealEvo/compiler/arm-sylixos-toolchain/arm-sylixos-eabi/include" kind="inc" path="" system="true"/>
<pathentry base-ref="bspam335x" include="C:/ACOINFO/RealEvo/compiler/arm-sylixos-toolchain/lib/gcc/arm-sylixos-eabi/4.9.3/include" kind="inc" path="" system="true"/>
</storageModule>
diff --git a/.reproject b/.reproject
index 1482404..631dea5 100644
--- a/.reproject
+++ b/.reproject
@@ -5,7 +5,7 @@
<OutputPath Name="Debug" Path="Debug" TreeNode="Debug"/>
<OutputPath Name="Release" Path="Release" TreeNode="Release"/>
</OutputSetting>
-<BaseSetting CoustomCfgMakefile="true" ProjectType="SylixOSBspProject"/>
+<BaseSetting BeLite="false" CoustomCfgMakefile="true" ProjectType="SylixOSBspProject"/>
<BspSetting TemplatePath="/bsp/arm/arm-none"/>
<FileFilter>
<PairItem key="SylixOS/driver/netif/netio/getopt.c" value=""/>
diff --git a/SylixOS/StarterWare/include/armv7a/cache.h b/SylixOS/StarterWare/include/armv7a/cache.h
index f648418..598bf5a 100644
--- a/SylixOS/StarterWare/include/armv7a/cache.h
+++ b/SylixOS/StarterWare/include/armv7a/cache.h
@@ -29,7 +29,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * Author: Jiao.JinXing <jiaojinxing@zthsoft.com>
+ * Author: Jiao.JinXing <jiaojinxing@acoinfo.com>
*
*/
#ifndef ARMV7A_CACHE_H_
diff --git a/SylixOS/driver/memory/am335x_nand.h b/SylixOS/driver/memory/am335x_nand.h
index 1d1a619..ed3ae89 100644
--- a/SylixOS/driver/memory/am335x_nand.h
+++ b/SylixOS/driver/memory/am335x_nand.h
@@ -29,7 +29,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * Author: Jiao.JinXing <jiaojinxing@zthsoft.com>
+ * Author: Jiao.JinXing <jiaojinxing@acoinfo.com>
*
*/
#ifndef AM335X_NAND_H_
diff --git a/SylixOS/driver/memory/memory_config.h b/SylixOS/driver/memory/memory_config.h
index f8a6e1f..8a3a15e 100644
--- a/SylixOS/driver/memory/memory_config.h
+++ b/SylixOS/driver/memory/memory_config.h
@@ -29,7 +29,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * Author: Jiao.JinXing <jiaojinxing@zthsoft.com>
+ * Author: Jiao.JinXing <jiaojinxing@acoinfo.com>
*
*/
#ifndef MEMORY_CONFIG_H_
diff --git a/SylixOS/driver/memory/memory_port.h b/SylixOS/driver/memory/memory_port.h
index 7b9f459..d3e5151 100644
--- a/SylixOS/driver/memory/memory_port.h
+++ b/SylixOS/driver/memory/memory_port.h
@@ -29,7 +29,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * Author: Jiao.JinXing <jiaojinxing@zthsoft.com>
+ * Author: Jiao.JinXing <jiaojinxing@acoinfo.com>
*
*/
#ifndef MEMORY_PORT_H_
@@ -148,8 +148,6 @@ typedef unsigned int dma_cap_mask_t;
#define EXPORT_SYMBOL(x);
-#define BIT(x) (1 << (x))
-
void complete(struct completion *);
void wait_for_completion(struct completion *);
void init_completion(struct completion *);
diff --git a/SylixOS/driver/pinmux/am335x_pinmux.h b/SylixOS/driver/pinmux/am335x_pinmux.h
index bf2d6f2..7f3ec19 100644
--- a/SylixOS/driver/pinmux/am335x_pinmux.h
+++ b/SylixOS/driver/pinmux/am335x_pinmux.h
@@ -29,7 +29,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * Author: Jiao.JinXing <jiaojinxing@zthsoft.com>
+ * Author: Jiao.JinXing <jiaojinxing@acoinfo.com>
*
*/
#ifndef AM335X_PINMUX_H_
diff --git a/SylixOS/driver/pinmux/mux_port.c b/SylixOS/driver/pinmux/mux_port.c
index 5e9ee45..f0712d3 100644
--- a/SylixOS/driver/pinmux/mux_port.c
+++ b/SylixOS/driver/pinmux/mux_port.c
@@ -39,32 +39,6 @@
#include "mux.h"
#include "am335x_pinmux.h"
-/**
- * strsep - Split a string into tokens
- * @s: The string to be searched
- * @ct: The characters to search for
- *
- * strsep() updates @s to point after the token, ready for the next call.
- *
- * It returns empty tokens, too, behaving exactly like the libc function
- * of that name. In fact, it was stolen from glibc2 and de-fancy-fied.
- * Same semantics, slimmer shape. ;)
- */
-char *strsep(char **s, const char *ct)
-{
- char *sbegin = *s;
- char *end;
-
- if (sbegin == NULL)
- return NULL;
-
- end = strpbrk(sbegin, ct);
- if (end)
- *end++ = '\0';
- *s = end;
- return sbegin;
-}
-
int strict_strtoul(const char *cp, unsigned int base, unsigned long *res)
{
char *tail;
diff --git a/SylixOS/driver/pinmux/mux_port.h b/SylixOS/driver/pinmux/mux_port.h
index 0350598..08a6b76 100644
--- a/SylixOS/driver/pinmux/mux_port.h
+++ b/SylixOS/driver/pinmux/mux_port.h
@@ -29,7 +29,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
- * Author: Jiao.JinXing <jiaojinxing@zthsoft.com>
+ * Author: Jiao.JinXing <jiaojinxing@acoinfo.com>
*
*/
#ifndef MUX_PORT_H_
diff --git a/config.mk b/config.mk
index 014e0a8..832160a 100644
--- a/config.mk
+++ b/config.mk
@@ -22,7 +22,7 @@
#*********************************************************************************************************
# SylixOS Base Project path
#*********************************************************************************************************
-SYLIXOS_BASE_PATH := D:\SylixOSDev\workspace\sylixos-base-a8
+SYLIXOS_BASE_PATH := D:\SylixOSDev\workspace_arm\sylixos-base-a8
#*********************************************************************************************************
# Debug options (debug or release)