summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThierry Carre2008-01-29 09:46:06 +0100
committerThierry Carre2008-01-29 09:46:06 +0100
commit5ba46fb9423de7cf24da850cfd91975d3c0c17a2 (patch)
tree8c15331fc1b89f7294bf9eadd15ec79ecccea291 /include
parent027eb7ed18ccb2c3e0daf680b718e08694ba82f4 (diff)
parent97efd7f502e5e0df79ecef824e3eae02453a6f19 (diff)
Merge Lisa & dev-3-9-8 : First step (compil ok, run fail)
Diffstat (limited to 'include')
-rw-r--r--include/cristina/cpu.h2
-rw-r--r--include/cristina/device.h6
-rw-r--r--include/cristina/ethdev.h9
-rw-r--r--include/cristina/tosv.h11
-rw-r--r--include/platform.h62
-rw-r--r--include/platform_lisa.h35
-rw-r--r--include/platform_tina.h33
7 files changed, 74 insertions, 84 deletions
diff --git a/include/cristina/cpu.h b/include/cristina/cpu.h
index eaa77c20ab..01f4f16de4 100644
--- a/include/cristina/cpu.h
+++ b/include/cristina/cpu.h
@@ -3,7 +3,7 @@
* PUBLIC INTERFACE
*
* $Workfile: cpu.h $
-* $Author: antunes $
+* $Author: mstankovic $
*
* Copyright (C) 2002 by OSE Systems. All rights reserved.
*
diff --git a/include/cristina/device.h b/include/cristina/device.h
index 4710c38513..28cb92053f 100644
--- a/include/cristina/device.h
+++ b/include/cristina/device.h
@@ -2,9 +2,9 @@
* HEADER
*
* $Workfile: device.h $
- * Document no: @(#) 510/OSE66-6 $Revision: 1.1 $
- * $Author: antunes $
- * $Date: 2005/03/31 14:56:58 $
+ * Document no: @(#) 510/OSE66-6 $Revision: 1.1.20.2 $
+ * $Author: mstankovic $
+ * $Date: 2007/10/24 11:44:40 $
*
* Copyright (C) 1996 by ENEA OSE SYSTEMS AB. All rights reserved.
*
diff --git a/include/cristina/ethdev.h b/include/cristina/ethdev.h
index 2457f0a61f..fd5a64b044 100644
--- a/include/cristina/ethdev.h
+++ b/include/cristina/ethdev.h
@@ -2,9 +2,9 @@
* HEADER
*
* $Workfile: ethdev.h $
- * Document no: @(#) 510/OSE66-7 $Revision: 1.1 $
- * $Author: antunes $
- * $Date: 2005/03/31 14:56:59 $
+ * Document no: @(#) 510/OSE66-7 $Revision: 1.1.20.2 $
+ * $Author: mstankovic $
+ * $Date: 2007/10/24 11:44:40 $
*
* Copyright (C) 1996 by ENEA OSE SYSTEMS AB. All rights reserved.
*
@@ -35,6 +35,9 @@
****************************************************************************
* 2 HISTORY OF DEVELOPMENT.
* $Log: ethdev.h,v $
+ * Revision 1.1.20.2 2007/10/24 11:44:40 mstankovic
+ * add missing platforms
+ *
* Revision 1.1 2005/03/31 14:56:59 antunes
* Adding OSE file for RTAI features
*
diff --git a/include/cristina/tosv.h b/include/cristina/tosv.h
index 8992d18b56..5fdf93eb54 100644
--- a/include/cristina/tosv.h
+++ b/include/cristina/tosv.h
@@ -3,10 +3,10 @@
* HEADER
*
* $Workfile: tosv.h $
- * Document no: @(#) 510/OSE18-1 $Revision: 1.2 $
- * $Revision: 1.2 $
- * $Author: save $
- * $Date: 2005/10/18 09:10:35 $
+ * Document no: @(#) 510/OSE18-1 $Revision: 1.2.16.2 $
+ * $Revision: 1.2.16.2 $
+ * $Author: mstankovic $
+ * $Date: 2007/10/24 11:44:41 $
*
* Copyright (C) 1997 by ENEA OSE SYSTEMS AB. All rights reserved.
*
@@ -41,6 +41,9 @@
* 2 HISTORY OF DEVELOPMENT.
*
* $Log: tosv.h,v $
+ * Revision 1.2.16.2 2007/10/24 11:44:41 mstankovic
+ * add missing platforms
+ *
* Revision 1.2 2005/10/18 09:10:35 save
* deamon
*
diff --git a/include/platform.h b/include/platform.h
index 6829fa0263..3a08f6cdcf 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -1,18 +1,70 @@
/*!
- \file fcm3-board.h
- \brief FCM3 board specific features
-
\author Jean-Philippe Save (jean-philippe.save@spidcom.com)
\author (c) SPiDCOM Technologies
- \version 1.0
- \date 06/07/07
+ \version 1.1
+ \date 2008/01/28
*/
/************************************************************/
#ifndef PLATFORM_H
#define PLATFORM_H
+/************************
+ * Common part.
+ ************************/
+
+#ifdef CONFIG_VERSION_16M
+
+#define PB_POOL_RING_SIZE (1024)
+
+#define DMA_RX_POOL2_NB_BUFFER 8
+#define DMA_RX_POOL1_NB_BUFFER 16
+#define DMA_RX_POOL0_NB_BUFFER 128
+
+#define DMA_TX_POOL2_NB_BUFFER 8
+#define DMA_TX_POOL1_NB_BUFFER 16
+#define DMA_TX_POOL0_NB_BUFFER 128
+
+#else
+
+#define PB_POOL_RING_SIZE (2048)
+
+#define DMA_RX_POOL2_NB_BUFFER 32
+#define DMA_RX_POOL1_NB_BUFFER 32
+#define DMA_RX_POOL0_NB_BUFFER 128
+
+#define DMA_TX_POOL2_NB_BUFFER 32
+#define DMA_TX_POOL1_NB_BUFFER 32
+#define DMA_TX_POOL0_NB_BUFFER 128
+#endif
+
+// 224 is the frame size before FEC
+#define PB_DMA_POOL_SIZE (PB_POOL_RING_SIZE*224)
+
+// WARNING buffer must no cross a 64 KB boundary !
+
+#define DMA_POOL2_BUFFER_SIZE (32768)
+#define DMA_POOL1_BUFFER_SIZE (4096)
+#define DMA_POOL0_BUFFER_SIZE (256)
+
+#define DMA_RX_POOL2_SIZE (DMA_RX_POOL2_NB_BUFFER * DMA_POOL2_BUFFER_SIZE)
+#define DMA_RX_POOL1_SIZE (DMA_RX_POOL1_NB_BUFFER * DMA_POOL1_BUFFER_SIZE)
+#define DMA_RX_POOL0_SIZE (DMA_RX_POOL0_NB_BUFFER * DMA_POOL0_BUFFER_SIZE)
+
+#define DMA_TX_POOL2_SIZE (DMA_TX_POOL2_NB_BUFFER * DMA_POOL2_BUFFER_SIZE)
+#define DMA_TX_POOL1_SIZE (DMA_TX_POOL1_NB_BUFFER * DMA_POOL1_BUFFER_SIZE)
+#define DMA_TX_POOL0_SIZE (DMA_TX_POOL0_NB_BUFFER * DMA_POOL0_BUFFER_SIZE)
+
+#define DMA_RX_POOL_SIZE (DMA_RX_POOL2_SIZE + DMA_RX_POOL1_SIZE + DMA_RX_POOL0_SIZE)
+#define DMA_TX_POOL_SIZE (DMA_TX_POOL2_SIZE + DMA_TX_POOL1_SIZE + DMA_TX_POOL0_SIZE)
+
+#define PLC_DMA_ZONE_SIZE (DMA_RX_POOL_SIZE + DMA_TX_POOL_SIZE + PB_DMA_POOL_SIZE)
+/************************
+ * Part not-common.
+ ************************/
+
+
/* include types only if we're not using assembler */
#if !defined(__asm__) && !defined(__ASSEMBLY__) && !defined(__KERNEL__)
#include "sp_types.h"
diff --git a/include/platform_lisa.h b/include/platform_lisa.h
index ccff393011..132292afbe 100644
--- a/include/platform_lisa.h
+++ b/include/platform_lisa.h
@@ -13,38 +13,6 @@
#ifndef PLATFORM_LISA_H
#define PLATFORM_LISA_H
-/* TOP-LEVEL include to set/change the defines related to memory cunsomption/usage */
-//PLC Part
-#define PB_POOL_RING_SIZE (2048)
-#define PB_DMA_POOL_SIZE (PB_POOL_RING_SIZE*224)
-
-// WARNING buffer must no cross a 64 KB boundary !
-
-#define DMA_POOL2_BUFFER_SIZE (32768)
-#define DMA_POOL1_BUFFER_SIZE (4096)
-#define DMA_POOL0_BUFFER_SIZE (256)
-
-#define DMA_RX_POOL2_NB_BUFFER 32
-#define DMA_RX_POOL1_NB_BUFFER 32
-#define DMA_RX_POOL0_NB_BUFFER 128
-
-#define DMA_TX_POOL2_NB_BUFFER 32
-#define DMA_TX_POOL1_NB_BUFFER 32
-#define DMA_TX_POOL0_NB_BUFFER 128
-
-#define DMA_RX_POOL2_SIZE (DMA_RX_POOL2_NB_BUFFER * DMA_POOL2_BUFFER_SIZE)
-#define DMA_RX_POOL1_SIZE (DMA_RX_POOL1_NB_BUFFER * DMA_POOL1_BUFFER_SIZE)
-#define DMA_RX_POOL0_SIZE (DMA_RX_POOL0_NB_BUFFER * DMA_POOL0_BUFFER_SIZE)
-
-#define DMA_TX_POOL2_SIZE (DMA_TX_POOL2_NB_BUFFER * DMA_POOL2_BUFFER_SIZE)
-#define DMA_TX_POOL1_SIZE (DMA_TX_POOL1_NB_BUFFER * DMA_POOL1_BUFFER_SIZE)
-#define DMA_TX_POOL0_SIZE (DMA_TX_POOL0_NB_BUFFER * DMA_POOL0_BUFFER_SIZE)
-
-#define DMA_RX_POOL_SIZE (DMA_RX_POOL2_SIZE + DMA_RX_POOL1_SIZE + DMA_RX_POOL0_SIZE)
-#define DMA_TX_POOL_SIZE (DMA_TX_POOL2_SIZE + DMA_TX_POOL1_SIZE + DMA_TX_POOL0_SIZE)
-
-#define PLC_DMA_ZONE_SIZE (DMA_RX_POOL_SIZE + DMA_TX_POOL_SIZE + PB_DMA_POOL_SIZE)
-
// ETH Part
#define ETH_LEN (1522)
#define ETH_TX_RING_SIZE (32)
@@ -63,9 +31,6 @@
#define DMA_ZONE_USED_SIZE (PLC_DMA_ZONE_SIZE + ETH_DMA_ZONE_SIZE)
#define DMA_ZONE_SIZE (((DMA_ZONE_USED_SIZE + 0x100000 - 1) / 0x100000) * 0x100000)
-//#if DMA_ZONE_SIZE != 0x300000
-//#error "rrah DMA_ZONE_SIZE error"
-//#endif
//DMAs Base Addresses
#define ETH_DMA_RX_BASE (DMA_zone_base)
diff --git a/include/platform_tina.h b/include/platform_tina.h
index e475b487e1..eb3d0249c2 100644
--- a/include/platform_tina.h
+++ b/include/platform_tina.h
@@ -1,36 +1,6 @@
#ifndef PLATFORM_TINA_H
#define PLATFORM_TINA_H
-/* TOP-LEVEL include to set/change the defines related to memory cunsomption/usage */
-
-#define PB_POOL_RING_SIZE (2048)
-#define PB_DMA_POOL_SIZE (PB_POOL_RING_SIZE*224)
-
-// WARNING buffer must no cross a 64 KB boundary !
-
-#define DMA_POOL2_BUFFER_SIZE (32768)
-#define DMA_POOL1_BUFFER_SIZE (4096)
-#define DMA_POOL0_BUFFER_SIZE (256)
-
-#define DMA_RX_POOL2_NB_BUFFER 32
-#define DMA_RX_POOL1_NB_BUFFER 32
-#define DMA_RX_POOL0_NB_BUFFER 128
-
-#define DMA_TX_POOL2_NB_BUFFER 32
-#define DMA_TX_POOL1_NB_BUFFER 32
-#define DMA_TX_POOL0_NB_BUFFER 128
-
-#define DMA_RX_POOL2_SIZE (DMA_RX_POOL2_NB_BUFFER * DMA_POOL2_BUFFER_SIZE)
-#define DMA_RX_POOL1_SIZE (DMA_RX_POOL1_NB_BUFFER * DMA_POOL1_BUFFER_SIZE)
-#define DMA_RX_POOL0_SIZE (DMA_RX_POOL0_NB_BUFFER * DMA_POOL0_BUFFER_SIZE)
-
-#define DMA_TX_POOL2_SIZE (DMA_TX_POOL2_NB_BUFFER * DMA_POOL2_BUFFER_SIZE)
-#define DMA_TX_POOL1_SIZE (DMA_TX_POOL1_NB_BUFFER * DMA_POOL1_BUFFER_SIZE)
-#define DMA_TX_POOL0_SIZE (DMA_TX_POOL0_NB_BUFFER * DMA_POOL0_BUFFER_SIZE)
-
-#define DMA_RX_POOL_SIZE (DMA_RX_POOL2_SIZE + DMA_RX_POOL1_SIZE + DMA_RX_POOL0_SIZE)
-#define DMA_TX_POOL_SIZE (DMA_TX_POOL2_SIZE + DMA_TX_POOL1_SIZE + DMA_TX_POOL0_SIZE)
-
#define ETH_DMA_ZONE_SIZE (32768*2)
#define PLC_DMA_ZONE_SIZE (DMA_RX_POOL_SIZE + DMA_TX_POOL_SIZE + PB_DMA_POOL_SIZE)
@@ -38,9 +8,6 @@
#define DMA_ZONE_USED_SIZE (PLC_DMA_ZONE_SIZE + ETH_DMA_ZONE_SIZE)
#define DMA_ZONE_SIZE (((DMA_ZONE_USED_SIZE + 0x100000 - 1) / 0x100000) * 0x100000)
-#if DMA_ZONE_SIZE != 0x300000
-#error "rrah"
-#endif
#define PLC_DMA_RX_BASE (DMA_zone_base+ETH_DMA_ZONE_SIZE)
#define PLC_DMA_TX_BASE (PLC_DMA_RX_BASE+DMA_RX_POOL_SIZE)