Removed Ringbuffer implementation in Library.

6 files changed, 7 insertions, 729 deletions

diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h
index 67371be..3a1c9d2 100755
--- a/include/dlt/dlt_common.h
+++ b/include/dlt/dlt_common.h
@@ -932,76 +932,6 @@ extern "C"
      */
     int dlt_check_storageheader(DltStorageHeader *storageheader);
 
-    /**
-     * Initialize ringbuffer of with a maximum size of size
-     * @param dltbuf Pointer to ringbuffer structure
-     * @param size Maximum size of buffer in bytes
-     * @return negative value if there was an error
-     */
-    int dlt_ringbuffer_init(DltRingBuffer *dltbuf, uint32_t size);
-
-    /**
-     * Release and free memory used by ringbuffer
-     * @param dltbuf Pointer to ringbuffer structure
-     * @return negative value if there was an error
-     */
-    int dlt_ringbuffer_free(DltRingBuffer *dltbuf);
-
-    /**
-     * Write one entry to ringbuffer
-     * @param dltbuf Pointer to ringbuffer structure
-     * @param data Pointer to data to be written to ringbuffer
-     * @param size Size of data in bytes to be written to ringbuffer
-     * @return negative value if there was an error
-     */
-    int dlt_ringbuffer_put(DltRingBuffer *dltbuf, void *data, uint32_t size);
-
-    /**
-     * Write one entry given as 3 chunks to ringbuffer
-     * @param dltbuf Pointer to ringbuffer structure
-     * @param data1 Pointer to data1 to be written to ringbuffer
-     * @param size1 Size of data1 in bytes to be written to ringbuffer
-     * @param data2 Pointer to data2 to be written to ringbuffer
-     * @param size2 Size of data2 in bytes to be written to ringbuffer
-     * @param data3 Pointer to data3 to be written to ringbuffer
-     * @param size3 Size of data3 in bytes to be written to ringbuffer
-     * @return negative value if there was an error
-     */
-    int dlt_ringbuffer_put3(DltRingBuffer *dltbuf, void *data1, uint32_t size1, void *data2, uint32_t size2, void *data3, uint32_t size3);
-
-    /**
-     * Read one entry from ringbuffer
-     * @param dltbuf Pointer to ringbuffer structure
-     * @param data Pointer to data read from ringbuffer
-     * @param size Size of read data in bytes from ringbuffer
-     * @return negative value if there was an error
-     */
-    int dlt_ringbuffer_get(DltRingBuffer *dltbuf, void *data, size_t *size);
-
-    /**
-     * Helper function: Skip one readable entry in ringbuffer
-     * @param dltbuf Pointer to ringbuffer structure
-     * @return negative value if there was an error
-     */
-    int dlt_ringbuffer_get_skip(DltRingBuffer *dltbuf);
-
-    /**
-     * Helper function: Get free space in bytes for writting between write and read position
-     * @param dltbuf Pointer to ringbuffer structure
-     * @param freespace Free Space in bytes for writting is returned
-     * @return negative value if there was an error
-     */
-    int dlt_ringbuffer_freespacewrite(DltRingBuffer *dltbuf, uint32_t *freespace);
-
-    /**
-     * Helper function: Check free space and if necessary discard entries, so that at least
-     * reqspace bytes are available for writting
-     * @param dltbuf Pointer to ringbuffer structure
-     * @param reqspace Requested space for writting in bytes
-     * @return negative value if there was an error
-     */
-    int dlt_ringbuffer_checkandfreespace(DltRingBuffer *dltbuf, uint32_t reqspace);
-
 #if !defined (__WIN32__)
 
     /**
diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
index 095bd45..1ea46cc 100755
--- a/include/dlt/dlt_user.h
+++ b/include/dlt/dlt_user.h
@@ -226,8 +226,6 @@ typedef struct
     int8_t enable_local_print;            /**< Local printing of log messages: 1 enabled, 0 disabled */
     int8_t local_print_mode;              /**< Local print mode, controlled by environment variable */
 
-    DltRingBuffer rbuf;                   /**< Ring-buffer for buffering messages during startup and missing connection */
-    
     DltShm dlt_shm;
 } DltUser;
 
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index 37f812c..4bab5fc 100755
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -316,12 +316,6 @@ int dlt_init_common(void)
     dlt_user.dlt_ll_ts_max_num_entries = 0;
     dlt_user.dlt_ll_ts_num_entries = 0;
 
-    if (dlt_ringbuffer_init(&(dlt_user.rbuf), DLT_USER_RINGBUFFER_SIZE)==-1)
-    {
-		dlt_user_initialised = 0;
-        return -1;
-    }
-
     signal(SIGPIPE,SIG_IGN);                  /* ignore pipe signals */
 
     atexit(dlt_user_atexit_handler);
@@ -379,9 +373,6 @@ int dlt_free(void)
 	/* Ignore return value */
     dlt_receiver_free(&(dlt_user.receiver));
 
-	/* Ignore return value */
-    dlt_ringbuffer_free(&(dlt_user.rbuf));
-
     if (dlt_user.dlt_ll_ts)
     {
         for (i=0;i<dlt_user.dlt_ll_ts_max_num_entries;i++)
@@ -863,16 +854,8 @@ int dlt_forward_msg(void *msgdata,size_t size)
         /* store message in ringbuffer, if an error has occured */
         if (ret!=DLT_RETURN_OK)
         {
-            DLT_SEM_LOCK();
-
-            if (dlt_ringbuffer_put3(&(dlt_user.rbuf),
-                                &(userheader), sizeof(DltUserHeader),
-                                 msgdata, size, 0, 0)==-1)
-			{
-				dlt_log(LOG_ERR,"Storing message to history buffer failed! Message discarded.\n");
-			}
-
-            DLT_SEM_FREE();
+			/* message could not be sent */
+			/* in old implementation messages was saved in ringbuffer */
         }
 
         switch (ret)
@@ -2180,17 +2163,8 @@ int dlt_user_log_send_log(DltContextData *log, int mtype)
         /* store message in ringbuffer, if an error has occured */
         if (ret!=DLT_RETURN_OK)
         {
-            DLT_SEM_LOCK();
-
-            if (dlt_ringbuffer_put3(&(dlt_user.rbuf),
-                                &(userheader), sizeof(DltUserHeader),
-                                msg.headerbuffer+sizeof(DltStorageHeader), msg.headersize-sizeof(DltStorageHeader),
-                                log->buffer, log->size)==-1)
-			{
-				dlt_log(LOG_ERR,"Storing message to history buffer failed! Message discarded.\n");
-			}
-
-            DLT_SEM_FREE();
+			/* in old implementation message was stored in ringbuffer
+			 * if it was not able to be sent. */
         }
 
         switch (ret)
@@ -2686,14 +2660,10 @@ int dlt_user_log_check_user_message(void)
 
 void dlt_user_log_reattach_to_daemon(void)
 {
-    int num, count, reregistered=0;
-
-    uint8_t buf[DLT_USER_RINGBUFFER_SIZE];
-    size_t size;
+    int num, reregistered=0;
 
 	DltContext handle;
 	DltContextData log_new;
-	DltReturnValue ret;
 
     if (dlt_user.dlt_log_handle<0)
     {
@@ -2746,43 +2716,8 @@ void dlt_user_log_reattach_to_daemon(void)
 
             if (reregistered==1)
             {
-                /* Send content of ringbuffer */
-                DLT_SEM_LOCK();
-                count = dlt_user.rbuf.count;
-                DLT_SEM_FREE();
-
-                for (num=0;num<count;num++)
-                {
-
-                    DLT_SEM_LOCK();
-                    dlt_ringbuffer_get(&(dlt_user.rbuf),buf,&size);
-                    DLT_SEM_FREE();
-
-                    if (size>0)
-                    {
-                        /* log to FIFO */
-                        ret = dlt_user_log_out3(dlt_user.dlt_log_handle, buf,size,0,0,0,0);
-
-                        /* in case of error, push message back to ringbuffer */
-                        if (ret!=DLT_RETURN_OK)
-                        {
-                            DLT_SEM_LOCK();
-                            if (dlt_ringbuffer_put(&(dlt_user.rbuf), buf, size)==-1)
-                            {
-								dlt_log(LOG_ERR,"Error pushing back message to history buffer. Message discarded.\n");
-                            }
-                            DLT_SEM_FREE();
-
-                            /* In case of: data could not be written, set overflow flag */
-                            if (ret==DLT_RETURN_PIPE_FULL)
-                            {
-                                dlt_user.overflow = 1;
-                            }
-                        }
-                    }
-
-                }
-            }
+                /* In old implementation Send content of ringbuffer */                
+			}
         }
     }
 }
diff --git a/src/lib/dlt_user_cfg.h b/src/lib/dlt_user_cfg.h
index 5b1e71e..419fbc2 100755
--- a/src/lib/dlt_user_cfg.h
+++ b/src/lib/dlt_user_cfg.h
@@ -87,9 +87,6 @@
 /* Size of receive buffer */

 #define DLT_USER_RCVBUF_MAX_SIZE 10024 

 

-/* Size of ring buffer */      

-#define DLT_USER_RINGBUFFER_SIZE 10024       

-

 /* Temporary buffer length */

 #define DLT_USER_BUFFER_LENGTH               255

 

diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c
index 4ac7dbe..d24527b 100755
--- a/src/shared/dlt_common.c
+++ b/src/shared/dlt_common.c
@@ -2231,469 +2231,6 @@ int dlt_check_storageheader(DltStorageHeader *storageheader)
              (storageheader->pattern[3] == 1));
 }
 
-int dlt_ringbuffer_init(DltRingBuffer *dltbuf, uint32_t size)
-{
-
-    if (dltbuf==0)
-    {
-        return -1;
-    }
-
-    if (size<=sizeof(uint32_t))
-    {
-        return -1;
-    }
-
-    dltbuf->buffer=(char*)malloc(size);
-    if (dltbuf->buffer==0)
-    {
-        return -1;
-    }
-
-    dltbuf->size=size;
-
-    dltbuf->pos_write=0;
-    dltbuf->pos_read=0;
-
-    dltbuf->count=0;
-
-    return 0;
-}
-
-int dlt_ringbuffer_free(DltRingBuffer *dltbuf)
-{
-
-    if (dltbuf==0)
-    {
-        return -1;
-    }
-
-    if (dltbuf->buffer)
-    {
-        free(dltbuf->buffer);
-    }
-
-    dltbuf->buffer=0;
-
-    dltbuf->size=0;
-
-    dltbuf->pos_write=0;
-    dltbuf->pos_read=0;
-
-    dltbuf->count=0;
-
-    return 0;
-}
-
-int dlt_ringbuffer_put(DltRingBuffer *dltbuf, void *data, uint32_t size)
-{
-    uint32_t sui, part1, part2;
-
-    if (dltbuf==0)
-    {
-        return -1;
-    }
-
-    if (dltbuf->buffer==0)
-    {
-        return -1;
-    }
-
-    if (data==0)
-    {
-        return -1;
-    }
-
-    sui = sizeof(uint32_t);
-
-    if ((size+sui)>dltbuf->size)
-    {
-        return -1;
-    }
-
-    dlt_ringbuffer_checkandfreespace(dltbuf, (size+sui));
-
-    if (dltbuf->pos_write >= dltbuf->size)
-    {
-        dltbuf->pos_write = 0;
-    }
-
-    /* Not enough space for one uint available before end of linear buffer */
-    /* Start at begin of linear buffer */
-    if ((dltbuf->size - dltbuf->pos_write) < sui)
-    {
-        dltbuf->pos_write = 0;
-    }
-
-    /* Write length of following data to buffer */
-    memcpy(&(dltbuf->buffer[dltbuf->pos_write]), &size, sui);
-    dltbuf->pos_write+=sui;
-
-    if (dltbuf->pos_write >= dltbuf->size)
-    {
-        dltbuf->pos_write = 0;
-    }
-
-    if ((dltbuf->size - dltbuf->pos_write) < size)
-    {
-        /* Not enough space til end of linear buffer, */
-        /* split up write call */
-        part1 = dltbuf->size - dltbuf->pos_write;
-        part2 = size - part1;
-
-        memcpy(dltbuf->buffer + dltbuf->pos_write, data, part1);
-        memcpy(dltbuf->buffer, ((char*)data) + part1, part2);
-        dltbuf->pos_write = part2;
-
-    }
-    else
-    {
-        /* Enough space til end of linear buffer */
-        memcpy(&(dltbuf->buffer[dltbuf->pos_write]), data, size);
-        dltbuf->pos_write+=size;
-    }
-
-    dltbuf->count++;
-
-    return 0;
-}
-
-
-int dlt_ringbuffer_put3(DltRingBuffer *dltbuf, void *data1, uint32_t size1, void *data2, uint32_t size2, void *data3, uint32_t size3)
-{
-    uint32_t sui, part1, part2;
-    uint32_t total_size;
-
-    if (dltbuf==0)
-    {
-        return -1;
-    }
-
-    if (dltbuf->buffer==0)
-    {
-        return -1;
-    }
-
-    sui = sizeof(uint32_t);
-
-    total_size = size1+size2+size3;
-
-    if ((total_size+sui)>dltbuf->size)
-    {
-        return -1;
-    }
-
-    dlt_ringbuffer_checkandfreespace(dltbuf, (total_size+sui));
-
-    if (dltbuf->pos_write >= dltbuf->size)
-    {
-        dltbuf->pos_write = 0;
-    }
-
-    /* Not enough space for one uint available before end of linear buffer */
-    /* Start at begin of linear buffer */
-    if ((dltbuf->size - dltbuf->pos_write) < sui)
-    {
-        dltbuf->pos_write = 0;
-    }
-
-    /* Write length of following data to buffer */
-    memcpy(&(dltbuf->buffer[dltbuf->pos_write]), &total_size, sui);
-    dltbuf->pos_write+=sui;
-
-    if (dltbuf->pos_write >= dltbuf->size)
-    {
-        dltbuf->pos_write = 0;
-    }
-
-    /* First chunk of data (data1, size1) */
-    if ((dltbuf->size - dltbuf->pos_write) < size1)
-    {
-        /* Not enough space til end of linear buffer, */
-        /* split up write call */
-        part1 = dltbuf->size - dltbuf->pos_write;
-        part2 = size1 - part1;
-
-        memcpy(dltbuf->buffer + dltbuf->pos_write, data1, part1);
-        memcpy(dltbuf->buffer, ((char*)data1) + part1, part2);
-        dltbuf->pos_write = part2;
-
-    }
-    else
-    {
-        /* Enough space til end of linear buffer */
-        memcpy(&(dltbuf->buffer[dltbuf->pos_write]), data1, size1);
-        dltbuf->pos_write+=size1;
-    }
-
-    if (dltbuf->pos_write >= dltbuf->size)
-    {
-        dltbuf->pos_write = 0;
-    }
-
-    /* Second chunk of data (data2, size2) */
-    if ((dltbuf->size - dltbuf->pos_write) < size2)
-    {
-        /* Not enough space til end of linear buffer, */
-        /* split up write call */
-        part1 = dltbuf->size - dltbuf->pos_write;
-        part2 = size2 - part1;
-
-        memcpy(dltbuf->buffer + dltbuf->pos_write, data2, part1);
-        memcpy(dltbuf->buffer, ((char*)data2) + part1, part2);
-        dltbuf->pos_write = part2;
-
-    }
-    else
-    {
-        /* Enough space til end of linear buffer */
-        memcpy(&(dltbuf->buffer[dltbuf->pos_write]), data2, size2);
-        dltbuf->pos_write+=size2;
-    }
-
-    if (dltbuf->pos_write >= dltbuf->size)
-    {
-        dltbuf->pos_write = 0;
-    }
-
-    /* Third chunk of data (data3, size3) */
-    if ((dltbuf->size - dltbuf->pos_write) < size3)
-    {
-        /* Not enough space til end of linear buffer, */
-        /* split up write call */
-        part1 = dltbuf->size - dltbuf->pos_write;
-        part2 = size3 - part1;
-
-        memcpy(dltbuf->buffer + dltbuf->pos_write, data3, part1);
-        memcpy(dltbuf->buffer, ((char*)data3) + part1, part2);
-        dltbuf->pos_write = part2;
-
-    }
-    else
-    {
-        /* Enough space til end of linear buffer */
-        memcpy(dltbuf->buffer + dltbuf->pos_write, data3, size3);
-        dltbuf->pos_write+=size3;
-    }
-
-    dltbuf->count++;
-
-    return 0;
-}
-
-int dlt_ringbuffer_get(DltRingBuffer *dltbuf, void *data, size_t *size)
-{
-    uint32_t tmpsize=0;
-    uint32_t sui;
-
-    uint32_t part1, part2;
-
-    if (dltbuf==0)
-    {
-        return -1;
-    }
-
-    if (dltbuf->buffer==0)
-    {
-        return -1;
-    }
-
-    if (dltbuf->count==0)
-    {
-        return -1;
-    }
-
-    sui = sizeof(uint32_t);
-
-    if (dltbuf->pos_read >= dltbuf->size)
-    {
-        dltbuf->pos_read = 0;
-    }
-
-    if ((dltbuf->size - dltbuf->pos_read) < sui)
-    {
-        dltbuf->pos_read = 0;
-    }
-
-    /* printf("Reading at offset: %d\n", dltbuf->pos_read); */
-
-    memcpy(&tmpsize,&(dltbuf->buffer[dltbuf->pos_read]), sui);
-    dltbuf->pos_read += sui;
-
-    if (dltbuf->pos_read >= dltbuf->size)
-    {
-        dltbuf->pos_read = 0;
-    }
-
-    if ((tmpsize>0) && ((tmpsize+sizeof(uint32_t))<=dltbuf->size))
-    {
-        if ((dltbuf->size - dltbuf->pos_read) < tmpsize)
-        {
-            /* Not enough space til end of linear buffer, */
-            /* split up read call */
-            part1 = dltbuf->size - dltbuf->pos_read;
-            part2 = tmpsize - part1;
-
-            memcpy(data, dltbuf->buffer + dltbuf->pos_read, part1);
-            memcpy(((char*)data)+part1, dltbuf->buffer, part2);
-            dltbuf->pos_read = part2;
-        }
-        else
-        {
-            /* Enough space til end of linear buffer */
-            /* no split up read call */
-            memcpy(data, &(dltbuf->buffer[dltbuf->pos_read]), tmpsize);
-            dltbuf->pos_read+=tmpsize;
-        }
-        *size = tmpsize;
-    }
-    else
-    {
-        data=0;
-        *size=0;
-    }
-
-    dltbuf->count--;
-
-    return 0;
-}
-
-int dlt_ringbuffer_get_skip(DltRingBuffer *dltbuf)
-{
-    uint32_t tmpsize=0;
-    uint32_t sui;
-
-    uint32_t part1, part2;
-
-    if (dltbuf==0)
-    {
-        return -1;
-    }
-
-    if (dltbuf->buffer==0)
-    {
-        return -1;
-    }
-
-    if (dltbuf->count==0)
-    {
-        return -1;
-    }
-
-    sui = sizeof(uint32_t);
-
-    if (dltbuf->pos_read >= dltbuf->size)
-    {
-        dltbuf->pos_read = 0;
-    }
-
-    if ((dltbuf->size - dltbuf->pos_read) < sui)
-    {
-        dltbuf->pos_read = 0;
-    }
-
-    memcpy(&tmpsize,&(dltbuf->buffer[dltbuf->pos_read]), sui);
-    dltbuf->pos_read += sui;
-
-    if (dltbuf->pos_read >= dltbuf->size)
-    {
-        dltbuf->pos_read = 0;
-    }
-
-    if ((tmpsize>0) && ((tmpsize+sui)<=dltbuf->size))
-    {
-        if ((dltbuf->size - dltbuf->pos_read) < tmpsize)
-        {
-            /* Not enough space til end of linear buffer */
-            part1 = dltbuf->size - dltbuf->pos_read;
-            part2 = tmpsize - part1;
-
-            dltbuf->pos_read = part2;
-        }
-        else
-        {
-            /* Enough space til end of linear buffer */
-            dltbuf->pos_read+=tmpsize;
-        }
-    }
-
-    dltbuf->count--;
-
-    return 0;
-}
-
-int dlt_ringbuffer_freespacewrite(DltRingBuffer *dltbuf, uint32_t *freespace)
-{
-    if ((dltbuf==0) || (freespace==0))
-    {
-        return -1;
-    }
-
-    *freespace=0;
-
-    /* Space til pos_read */
-    if (dltbuf->pos_read > dltbuf->pos_write)
-    {
-        *freespace=(dltbuf->pos_read - dltbuf->pos_write);
-        return 0;
-    }
-    else if (dltbuf->pos_read < dltbuf->pos_write)
-    {
-        *freespace=(dltbuf->size - dltbuf->pos_write + dltbuf->pos_read );
-        return 0;
-    }
-    else
-    {
-        if (dltbuf->count)
-        {
-            return 0;
-        }
-        else
-        {
-            *freespace=dltbuf->size;
-            return 0;
-        }
-    }
-    return 0;
-}
-
-int dlt_ringbuffer_checkandfreespace(DltRingBuffer *dltbuf, uint32_t reqspace)
-{
-    uint32_t space_left;
-
-    if (dltbuf==0)
-    {
-        return -1;
-    }
-
-    if (dlt_ringbuffer_freespacewrite(dltbuf,&space_left) == -1)
-    {
-        return -1;
-    }
-
-    /* printf("Now reading at: %d, space_left = %d, req = %d, r=%d, w=%d, count=%d \n",
-              dltbuf->pos_read,space_left, reqspace, dltbuf->pos_read, dltbuf->pos_write, dltbuf->count); */
-
-    while (space_left<reqspace)
-    {
-        /* Overwrite, correct read position */
-
-        /* Read and skip one element */
-        dlt_ringbuffer_get_skip(dltbuf);
-
-        /* Space until pos_read */
-        if (dlt_ringbuffer_freespacewrite(dltbuf,&space_left) == -1)
-	    {
-		    return -1;
-	    }
-
-        /* printf("Overwrite: Now reading at: %d, space_left = %d, req = %d, r=%d, w=%d, count=%d \n",
-                  dltbuf->pos_read,space_left, reqspace, dltbuf->pos_read, dltbuf->pos_write, dltbuf->count); */
-    }
-
-    return 0;
-}
-
 #if !defined (__WIN32__)
 
 int dlt_setup_serial(int fd, speed_t speed)
diff --git a/src/tests/dlt-test-internal.c b/src/tests/dlt-test-internal.c
index 00209f1..02142b9 100755
--- a/src/tests/dlt-test-internal.c
+++ b/src/tests/dlt-test-internal.c
@@ -179,11 +179,6 @@ int main(int argc, char* argv[])
         return -1;
     }
 
-    if (test[0])
-    {
-    	internal1();
-    }
-
     printf("\n");
     printf("%d tests passed\n",tests_passed);
     printf("%d tests failed\n",tests_failed);
@@ -191,117 +186,3 @@ int main(int argc, char* argv[])
     return 0;
 }
 
-void internal1(void)
-{
-    int index,result_index;
-    unsigned int c;
-    unsigned int size;
-
-    char buf[1024],result[1024];
-
-    DltRingBuffer mybuf;
-
-    printf("Test1i: Ringbuffer, writing and reading \n");
-
-    for (size=8;size<=30;size++)
-    {
-
-        dlt_ringbuffer_init(&mybuf, size);
-
-        memset(result,0,1024);
-
-        if (vflag)
-        {
-        	printf("\nRingbuffer Size = %d \n\n",size);
-        }
-
-        /* Write several times to ringbuffer */
-        for (index=0; index<6; index++)
-        {
-            memset(buf,0,1024);
-
-            sprintf(buf,"%d",index);
-            dlt_ringbuffer_put(&mybuf,buf,strlen(buf));
-
-            if (vflag)
-            {
-                printf("W[%d], Bytes = %d, Hex: ", index, strlen(buf));
-                dlt_print_hex((uint8_t *)buf, strlen(buf));
-                printf("\n");
-            }
-        }
-
-        if (vflag)
-        {
-			printf("\nCount=%d, Max. by buffer size %d = %d\n",mybuf.count, size, (int)(size/(strlen(buf)+sizeof(unsigned int))));
-        }
-
-        /* Check value of mybuf.count, counting the elements in ringbuffer */
-        if (mybuf.count!=(int)(size/(strlen(buf)+sizeof(unsigned int))))
-        {
-            tests_failed++;
-            printf("Test1i FAILED\n");
-
-            break;
-        }
-
-        result_index = 0;
-
-        /* Read several times from ringbuffer */
-        for (index=0; index<6; index++)
-        {
-            memset(buf,0,1024);
-
-            if (dlt_ringbuffer_get(&mybuf,buf,&c)!=-1)
-            {
-                if (vflag)
-                {
-                    printf("R[%d], Bytes = %d, Hex: ", index, c);
-                    dlt_print_hex((uint8_t *)buf, c);
-                    printf("\n");
-                }
-
-                if (c==1)
-                {
-					result[result_index] = buf[0];
-                }
-                result_index++;
-            }
-        }
-
-        /* Check value of mybuf.count, counting the elements in ringbuffer, must be 0 now */
-        if (mybuf.count!=0)
-        {
-            tests_failed++;
-            printf("Test1i FAILED\n");
-
-            dlt_ringbuffer_free(&mybuf);
-            return;
-        }
-
-        /* Check the read elements */
-        for (index=0; index<result_index; index++)
-        {
-            sprintf(buf,"%d",((6-result_index)+index));
-            if (result[index]!=buf[0])
-            {
-                tests_failed++;
-                printf("Test1i FAILED\n");
-
-                dlt_ringbuffer_free(&mybuf);
-                return;
-            }
-        }
-
-        if (vflag)
-        {
-        	printf("\n");
-        }
-
-        dlt_ringbuffer_free(&mybuf);
-    }
-
-    tests_passed++;
-    printf("Test1i PASSED\n");
-}
-