Changeset 374 for trunk

Timestamp:

Apr 18, 2013, 1:28:33 PM (11 years ago)

Author:

joannou

Message:

Introducing vci_block_device_tsar component

Location:

trunk/modules/vci_block_device_tsar

Files:

• . (copied) (copied from branches/v4/modules/vci_block_device_tsar_v4)
• caba/metadata/vci_block_device_tsar.sd (copied) (copied from branches/v4/modules/vci_block_device_tsar_v4/caba/metadata/vci_block_device_tsar_v4.sd) (1 diff)
• caba/metadata/vci_block_device_tsar_v4.sd (deleted)
• caba/source/include/vci_block_device_tsar.h (copied) (copied from branches/v4/modules/vci_block_device_tsar_v4/caba/source/include/vci_block_device_tsar_v4.h) (5 diffs)
• caba/source/include/vci_block_device_tsar_v4.h (deleted)
• caba/source/src/vci_block_device_tsar.cpp (copied) (copied from branches/v4/modules/vci_block_device_tsar_v4/caba/source/src/vci_block_device_tsar_v4.cpp) (8 diffs)
• caba/source/src/vci_block_device_tsar_v4.cpp (deleted)
• include/soclib/block_device_tsar.h (copied) (copied from branches/v4/modules/vci_block_device_tsar_v4/include/soclib/block_device_tsar_v4.h) (2 diffs)
• include/soclib/block_device_tsar_v4.h (deleted)

trunk/modules/vci_block_device_tsar/caba/metadata/vci_block_device_tsar.sd

@@ -2 +2 @@
 # -*- python -*-
 
-Module('caba:vci_block_device_tsar_v4',
-           classname = 'soclib::caba::VciBlockDeviceTsarV4',
+Module('caba:vci_block_device_tsar',
+           classname = 'soclib::caba::VciBlockDeviceTsar',
            tmpl_parameters = [ parameter.Module('vci_param',  default = 'caba:vci_param'), ],
-           header_files = ['../source/include/vci_block_device_tsar_v4.h', ],
-           interface_files = ['../../include/soclib/block_device_tsar_v4.h', ],
-           implementation_files = ['../source/src/vci_block_device_tsar_v4.cpp',],
+           header_files = ['../source/include/vci_block_device_tsar.h', ],
+           interface_files = ['../../include/soclib/block_device_tsar.h', ],
+           implementation_files = ['../source/src/vci_block_device_tsar.cpp',],
            ports = [
                 Port('caba:vci_target', 'p_vci_target'),

trunk/modules/vci_block_device_tsar/caba/source/include/vci_block_device_tsar.h

@@ -73 +73 @@
 ///////////////////////////////////////////////////////////////////////////
 
-#ifndef SOCLIB_VCI_BLOCK_DEVICE_TSAR_V4_H
-#define SOCLIB_VCI_BLOCK_DEVICE_TSAR_V4_H
+#ifndef SOCLIB_VCI_BLOCK_DEVICE_TSAR_H
+#define SOCLIB_VCI_BLOCK_DEVICE_TSAR_H
 
 #include <stdint.h>
@@ -89 +89 @@
 
 template<typename vci_param>
-class VciBlockDeviceTsarV4
+class VciBlockDeviceTsar
         : public caba::BaseModule
 {
@@ -200 +200 @@
 protected:
 
-    SC_HAS_PROCESS(VciBlockDeviceTsarV4);
+    SC_HAS_PROCESS(VciBlockDeviceTsar);
 
 public:
@@ -214 +214 @@
 
     // Constructor   
-    VciBlockDeviceTsarV4(
+    VciBlockDeviceTsar(
                 sc_module_name                      name,
                 const soclib::common::MappingTable      &mt,
@@ -227 +227 @@
 }}
 
-#endif /* SOCLIB_VCI_BLOCK_DEVICE_TSAR_V4_H */
+#endif /* SOCLIB_VCI_BLOCK_DEVICE_TSAR_H */
 
 // Local Variables:

trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp

@@ -30 +30 @@
 #include <iostream>
 #include <fcntl.h>
-#include "vci_block_device_tsar_v4.h"
+#include "vci_block_device_tsar.h"
 
 namespace soclib { namespace caba {
 
-#define tmpl(t) template<typename vci_param> t VciBlockDeviceTsarV4<vci_param>
+#define tmpl(t) template<typename vci_param> t VciBlockDeviceTsar<vci_param>
 
 using namespace soclib::caba;
@@ -535 +535 @@
 
 //////////////////////////////////////////////////////////////////////////////
-tmpl(/**/)::VciBlockDeviceTsarV4( sc_core::sc_module_name              name, 
+tmpl(/**/)::VciBlockDeviceTsar( sc_core::sc_module_name              name, 
                                   const soclib::common::MappingTable   &mt,
                                   const soclib::common::IntTab         &srcid,
@@ -571 +571 @@
         (block_size != 4096) )
         {
-                std::cout << "Error in component VciBlockDeviceTsarV4 : " << name << std::endl;
+                std::cout << "Error in component VciBlockDeviceTsar : " << name << std::endl;
                 std::cout << "The block size must be 128, 256, 512, 1024, 2048 or 4096 bytes" << std::endl;
                 exit(1);
@@ -583 +583 @@
                 (burst_size != 64) )
         {
-                std::cout << "Error in component VciBlockDeviceTsarV4 : " << name << std::endl;
+                std::cout << "Error in component VciBlockDeviceTsar : " << name << std::endl;
                 std::cout << "The burst size must be 1, 2, 4, 8, 16, 32 or 64 bytes" << std::endl;
                 exit(1);
@@ -589 +589 @@
         if ( m_segment.size() < 32 ) 
         {
-                std::cout << "Error in component VciBlockDeviceTsarV4 : " << name << std::endl;
+                std::cout << "Error in component VciBlockDeviceTsar : " << name << std::endl;
                 std::cout << "The size of the segment cannot be smaller than 32 bytes" << std::endl;
                 exit(1);
@@ -595 +595 @@
         if ( (m_segment.baseAddress() & 0x0000001F) != 0 ) 
         {
-                std::cout << "Error in component VciBlockDeviceTsarV4 : " << name << std::endl;
+                std::cout << "Error in component VciBlockDeviceTsar : " << name << std::endl;
                 std::cout << "The base address of the segment must be multiple of 32 bytes" << std::endl;
                 exit(1);
@@ -601 +601 @@
         if ( vci_param::B != 4 )
         {
-                std::cout << "Error in component VciBlockDeviceTsarV4 : " << name << std::endl;
+                std::cout << "Error in component VciBlockDeviceTsar : " << name << std::endl;
                 std::cout << "The VCI data fields must have 32 bits" << std::endl;
                 exit(1);
@@ -608 +608 @@
         if ( m_fd < 0 ) 
         {
-                std::cout << "Error in component VciBlockDeviceTsarV4 : " << name << std::endl;
+                std::cout << "Error in component VciBlockDeviceTsar : " << name << std::endl;
                 std::cout << "Unable to open file " << filename << std::endl;
                 exit(1);

trunk/modules/vci_block_device_tsar/include/soclib/block_device_tsar.h

@@ -25 +25 @@
  * Maintainers: alain
  */
-#ifndef BLOCK_DEVICE_TSAR_V4_REGS_H
-#define BLOCK_DEVICE_TSAR_V4_REGS_H
+#ifndef BLOCK_DEVICE_TSAR_REGS_H
+#define BLOCK_DEVICE_TSAR_REGS_H
 
 enum SoclibBlockDeviceRegisters {
@@ -54 +54 @@
 };
 
-#endif /* BLOCK_DEVICE_TSAR_V4_REGS_H */
+#endif /* BLOCK_DEVICE_TSAR_REGS_H */
 
 // Local Variables: