Git-Mirrors/OpenModem
1
0
Fork 0
mirror of https://github.com/markqvist/OpenModem.git synced 2025-05-02 06:26:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Before interleaver

Browse source
This commit is contained in:
Mark Qvist 2014-04-15 20:18:22 +02:00
parent 565a5f35eb
commit 0b2683e486
6 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Modem/protocol/mp1.c
View file

@ -113,6 +113,8 @@ void mp1Poll(MP1 *mp1) {
mp1->checksum_in ^= correction;
}
mp1->buffer[mp1->packetLength-(2-i)] ^= correction;
if (s != 0) mp1->correctionsMade += 1;
}
}
continue;
@ -129,13 +131,15 @@ void mp1Poll(MP1 *mp1) {
// the end of the packet. Pass control to the
// decoder.
if ((mp1->checksum_in & 0xff) == 0x00) {
kprintf("[CHK-OK] [C=%d] ", mp1->correctionsMade);
mp1Decode(mp1);
} else {
// Checksum was incorrect, we don't do anything,
// but you can enable the decode anyway, if you
// need it for testing or debugging
// kprintf("[ER] [%d] ", mp1->checksum_in);
//mp1Decode(mp1);
kprintf("[CHK-ER] [C=%d] ", mp1->correctionsMade);
mp1Decode(mp1);
}
}
// If the above is not the case, this must be the
@ -144,6 +148,7 @@ void mp1Poll(MP1 *mp1) {
mp1->packetLength = 0;
mp1->readLength = 0;
mp1->checksum_in = MP1_CHECKSUM_INIT;
mp1->correctionsMade = 0;
// We have indicated that we are reading,
// and reset the length counter. Now we'll
@ -206,8 +211,6 @@ static void mp1Putbyte(MP1 *mp1, uint8_t byte) {
byte == HDLC_RESET ||
byte == AX25_ESC) {
kfile_putc(AX25_ESC, mp1->modem);
lastByte = AX25_ESC;
//sendParityBlock ^= true;
}
kfile_putc(byte, mp1->modem);
@ -221,6 +224,19 @@ static void mp1Putbyte(MP1 *mp1, uint8_t byte) {
sendParityBlock ^= true;
}
static void mp1WriteByte(MP1 *mp1, uint8_t byte) {
// If we are sending something that looks
// like an HDLC special byte, send an escape
// character first
if (byte == HDLC_FLAG ||
byte == HDLC_RESET ||
byte == AX25_ESC) {
kfile_putc(AX25_ESC, mp1->modem);
}
kfile_putc(byte, mp1->modem);
}
void mp1Send(MP1 *mp1, const void *_buffer, size_t length) {
// Get the transmit data buffer
const uint8_t *buffer = (const uint8_t *)_buffer;
@ -234,7 +250,6 @@ void mp1Send(MP1 *mp1, const void *_buffer, size_t length) {
bool packetCompression = false;
size_t compressedSize = compress(buffer, length);
if (compressedSize != 0 && compressedSize < length) {
//kprintf("Using compression\n");
// Compression saved us some space, we'll
// send the paket compressed
packetCompression = true;

3
Modem/protocol/mp1.h
View file

@ -6,7 +6,7 @@
// Frame sizing & checksum
#define MP1_MIN_FRAME_LENGTH 3
#define MP1_MAX_FRAME_LENGTH 200
#define MP1_MAX_FRAME_LENGTH 300
#define MP1_CHECKSUM_INIT 0xAA
// We need to know some basic HDLC flag bytes
@ -44,6 +44,7 @@ typedef struct MP1 {
bool reading; // True when we have seen a HDLC flag
bool escape; // We need to know if we are in an escape sequence
bool fecEscape; // fec escape
long correctionsMade; // correction count
} MP1;
// A struct encapsulating a network packet