I2C. Merged code from trunk.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3036 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 5 insertions, 2 deletions

diff --git a/os/kernel/include/chheap.h b/os/kernel/include/chheap.h
index 1c5ec5419..0db1cbc1d 100644
--- a/os/kernel/include/chheap.h
+++ b/os/kernel/include/chheap.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -74,8 +75,10 @@ struct memory_heap {
 #ifdef __cplusplus

 extern "C" {

 #endif

-  void heap_init(void);

+  void _heap_init(void);

+#if !CH_USE_MALLOC_HEAP

   void chHeapInit(MemoryHeap *heapp, void *buf, size_t size);

+#endif

   void *chHeapAlloc(MemoryHeap *heapp, size_t size);

   void chHeapFree(void *p);

   size_t chHeapStatus(MemoryHeap *heapp, size_t *sizep);