Changeset 374 for trunk/modules/vci_block_device_tsar/caba/source/src

Timestamp:

Apr 18, 2013, 1:28:33 PM (12 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/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)

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);