Pull in Android_System_ANT-HAL_1-3-0
diff --git a/Android.mk b/Android.mk
index e3f5ae7..3ee7f89 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,6 +32,10 @@
ANT_DIR := src/bluez_hci
+else ifeq ($(BOARD_ANT_WIRELESS_DEVICE),"cg29xx")
+
+ANT_DIR := src/vfs
+
else ifeq ($(BOARD_ANT_WIRELESS_DEVICE),"vfs-prerelease")
ANT_DIR := src/vfs
diff --git a/src/common/inc/ant_version.h b/src/common/inc/ant_version.h
index 8f1eb7a..8270723 100644
--- a/src/common/inc/ant_version.h
+++ b/src/common/inc/ant_version.h
@@ -20,8 +20,8 @@
#define __ANT_VERSION_H
#define LIBANT_STACK_MAJOR "1"
-#define LIBANT_STACK_MINOR "2"
-#define LIBANT_STACK_INCRE "1"
+#define LIBANT_STACK_MINOR "3"
+#define LIBANT_STACK_INCRE "0"
#endif // __ANT_VERSION_H
diff --git a/src/vfs/Android.mk b/src/vfs/Android.mk
index 3090520..969fa03 100644
--- a/src/vfs/Android.mk
+++ b/src/vfs/Android.mk
@@ -14,9 +14,6 @@
# limitations under the License.
#
-# Check for all VFS transport chip types:
-ifeq ($(BOARD_ANT_WIRELESS_DEVICE),"vfs-prerelease")
-
include $(CLEAR_VARS)
LOCAL_CFLAGS := -g -c -W -Wall -O2
@@ -25,7 +22,11 @@
$(LOCAL_PATH)/src/common/inc \
$(LOCAL_PATH)/$(ANT_DIR)/inc \
-ifeq ($(BOARD_ANT_WIRELESS_DEVICE),"vfs-prerelease")
+ifeq ($(BOARD_ANT_WIRELESS_DEVICE),"cg29xx")
+LOCAL_C_INCLUDES += \
+ $(ANT_DIR)/ste/cg29xx \
+
+else ifeq ($(BOARD_ANT_WIRELESS_DEVICE),"vfs-prerelease")
LOCAL_C_INCLUDES += \
$(ANT_DIR)/prerelease \
@@ -52,5 +53,3 @@
LOCAL_MODULE := libantradio
include $(BUILD_SHARED_LIBRARY)
-
-endif # BOARD_ANT_WIRELESS_DEVICE VFS
diff --git a/src/vfs/ste/cg29xx/ant_driver_defines.h b/src/vfs/ste/cg29xx/ant_driver_defines.h
new file mode 100644
index 0000000..238782b
--- /dev/null
+++ b/src/vfs/ste/cg29xx/ant_driver_defines.h
@@ -0,0 +1,67 @@
+/*
+ * ANT Stack
+ *
+ * Copyright 2011 Dynastream Innovations
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*******************************************************************************\
+*
+* FILE NAME: ant_driver_defines.h
+*
+* BRIEF:
+* This file defines constants for the ST-E CG29XX implementation
+*
+*
+\*******************************************************************************/
+
+#ifndef __VFS_PRERELEASE_H
+#define __VFS_PRERELEASE_H
+
+#define ANT_CHIP_NAME "ST-E CG29XX"
+
+#define ANT_COMMANDS_DEVICE_NAME "/dev/cg2900_antradio_cmd"
+#define ANT_DATA_DEVICE_NAME "/dev/cg2900_antradio_data"
+
+// TODO Must define ANT_IOCTL_RESET to value driver is expecting
+#define ANT_IOCTL_RESET _IO('H', 160)
+
+// -----------------------------------------
+// | Header | Data | Footer |
+// |----------------------|-----------------|
+// |Optional| Data | Opt. | ... | Optional |
+// | Opcode | Size | Sync | | Checksum |
+
+#define ANT_HCI_OPCODE_SIZE 0
+#define ANT_HCI_SIZE_SIZE 1
+
+#define ANT_HCI_SYNC_SIZE 0
+#define ANT_HCI_CHECKSUM_SIZE 0
+
+#define ANT_MESG_FLOW_CONTROL ((ANT_U8)0xC9)
+
+#define ANT_FLOW_GO ((ANT_U8)0x00)
+
+// ---------------------- Not chip specific
+
+#define ANT_HCI_HEADER_SIZE ((ANT_HCI_OPCODE_SIZE) + (ANT_HCI_SIZE_SIZE) + (ANT_HCI_SYNC_SIZE))
+
+#define ANT_HCI_OPCODE_OFFSET 0
+#define ANT_HCI_SIZE_OFFSET ((ANT_HCI_OPCODE_OFFSET) + (ANT_HCI_OPCODE_SIZE))
+#define ANT_HCI_SYNC_OFFSET ((ANT_HCI_SIZE_OFFSET) + (ANT_HCI_SIZE_SIZE))
+#define ANT_HCI_DATA_OFFSET (ANT_HCI_HEADER_SIZE)
+
+#define ANT_FLOW_STOP ((ANT_U8)0x80)
+#define ANT_FLOW_GO_WAIT_TIMEOUT_SEC 10
+
+#endif /* ifndef __VFS_PRERELEASE_H */