[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18215 - in libmwmodem/src: include main
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r18215 - in libmwmodem/src: include main |
|
Date: |
Sat, 19 Nov 2011 08:49:25 +0100 |
Author: ruppa
Date: 2011-11-19 08:49:25 +0100 (Sat, 19 Nov 2011)
New Revision: 18215
Modified:
libmwmodem/src/include/libmwmodem.h
libmwmodem/src/main/libmwmodem.c
Log:
channel import implemented
Author: Christian Rupp
Date: 2011-11-19 0849
Modified: libmwmodem/src/include/libmwmodem.h
===================================================================
--- libmwmodem/src/include/libmwmodem.h 2011-11-19 05:34:19 UTC (rev 18214)
+++ libmwmodem/src/include/libmwmodem.h 2011-11-19 07:49:25 UTC (rev 18215)
@@ -48,6 +48,11 @@
#define MWMODEM_MAXMESSLENGTH 65507
/**
+ * The maximal content for a channel queue
+ */
+#define MWMODEM_MAX_QUEUE 64
+
+/**
* Definition of all existend Modcodes of DVB-S2 with a Prefix (MOD_).
* Code Rates 1/4 are written 1_4!
* Defined at
http://www.etsi.org/deliver/etsi_en/302300_302399/302307/01.02.01_60/en_302307v010201p.pdf.
@@ -81,7 +86,7 @@
MWMODEM_MOD_32APSK_4_5 = 25,
MWMODEM_MOD_32APSK_5_6 = 26,
MWMODEM_MOD_32APSK_8_9 = 27,
- MMWMODEM_OD_32APSK_9_10 = 28,
+ MWMODEM_MOD_32APSK_9_10 = 28,
/*
*Reserved and currently not used!
*/
Modified: libmwmodem/src/main/libmwmodem.c
===================================================================
--- libmwmodem/src/main/libmwmodem.c 2011-11-19 05:34:19 UTC (rev 18214)
+++ libmwmodem/src/main/libmwmodem.c 2011-11-19 07:49:25 UTC (rev 18215)
@@ -18,7 +18,7 @@
*/
-#include "libmwmodem.c"
+#include "libmwmodem.h"
#include <sys/socket.h>
#include <stdint.h>
@@ -37,7 +37,7 @@
if (content.socket==-1)
{
- printf("Error no socket createt!");
+ printf("Error no socket created!");
return null;
}
@@ -90,22 +90,96 @@
byte4[0]= buffer[4];
byte4[1]= buffer[5];
byte4[2]= buffer[6];
- byte4[3]= buffer[7];
+ byte4[3]= buffer[7];
//TODO Time
byte4[0]= buffer[8];
- byte4[1]= buffer[9];
- byte4[2]= buffer[10];
- byte4[3]= buffer[11];
+ byte4[1]= buffer[9];
+ byte4[2]= buffer[10];
+ byte4[3]= buffer[11];
package.symbolrate = ntohl((uint32_t) byte4);
package.num_channels = (uint8_t) buffer[12];
package.channel = malloc(package.num_channels);
- int i, bufferzelle;
- for(i=0;i<=package.num_channels; i++)//TODO parse channels
+ int i, currentBufferZelle;
+ currentBufferZelle = 13;
+ for(i=0;i<=package.num_channels; i++)
{
+ struct MWMODEM_Channel channel;
+
+ if(buffer[currentBufferZelle]==i)
+ {
+ currentBufferZelle+=1;
+
+
if(buffer[currentBufferZelle]<MWMODEM_ModCode.MWMODEM_MOD_DUMMY
+
&&buffer[currentBufferZelle]>MWMODEM_ModeCode.MWMODEM_MOD_RESERVED)
+ {
+ switch(buffer[currentBufferZelle])
+ {
+ case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_1_4 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_1_4;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_1_3 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_1_3;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_2_5 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_2_5;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_1_2 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_1_2;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_3_5 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_3_5;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_2_3 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_2_3;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_3_4 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_3_4;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_4_5 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_4_5;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_5_6 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_5_6;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_8_9 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_8_9;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_9_10 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_9_10;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_3_5 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_3_5;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_2_3 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_2_3;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_3_4 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_3_4;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_5_6 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_5_6;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_8_9 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_8_9;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_9_10 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_9_10;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_2_3 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_2_3;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_3_4 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_3_4;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_4_5 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_4_5;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_5_6 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_5_6;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_8_9 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_8_9;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_9_10 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_9_10;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_3_4 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_3_4;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_4_5 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_4_5;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_5_6 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_5_6;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_8_9 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_8_9;
+ case
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_9_10 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_9_10;
+ }
+ }
+ else
+ {
+ printf("Error no correct satellite
modcode!");
+ return null;
+ }
+ currentBufferZelle+=1;
+
+ channel.queue = (uint8_t)
buffer[currentBufferZelle];
+
+ currentBufferZelle+=1;
+
+ byte4[0] = buffer[currentBufferZelle];
+ currentBufferZelle+=1;
+ byte4[1] = buffer[currentBufferZelle];
+ currentBufferZelle+=1;
+ byte4[2] = buffer[currentBufferZelle];
+ currentBufferZelle+=1;
+ byte4[3] = buffer[currentBufferZelle];
+ channel.datasent = ntohl((uint32_t) byte4);
+ currentBufferZelle+=1;
+
+ byte4[0] = buffer[currentBufferZelle];
+ currentBufferZelle+=1;
+ byte4[1] = buffer[currentBufferZelle];
+ currentBufferZelle+=1;
+ byte4[2] = buffer[currentBufferZelle];
+ currentBufferZelle+=1;
+ byte4[3] = buffer[currentBufferZelle];
+ channel.symbolratelimit = ntohl((uint32_t)
byte4);
+ package.channel[i] = channel;
+ currentBufferZelle+=1;
+ }
}
}
else return null;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18215 - in libmwmodem/src: include main,
gnunet <=