Changeset 2724:0a95ae49bce7 in roaraudio

Timestamp:

09/16/09 12:26:12 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

crc depends on block type

Location:

roard

Files:

• include/rdtcs.h (modified) (1 diff)
• rdtcs.c (modified) (3 diffs)

roard/include/rdtcs.h

@@ -63 +63 @@
 int rdtcs_send_stream_rds_group  (int id, struct roar_stream_server *  ss);
 
-uint16_t rdtcs_rds_crc_calc      (uint16_t data);
+uint16_t rdtcs_rds_crc_calc      (uint16_t data, int block);
 
 #endif

roard/rdtcs.c

@@ -86 +86 @@
  char out[RDTCS_RDS_GROUP_LEN];
  char * c;
+ int      block[4] = {RDTCS_RDS_BLOCK_A, RDTCS_RDS_BLOCK_B, RDTCS_RDS_BLOCK_C0, RDTCS_RDS_BLOCK_D};
  uint16_t data[4];
  uint16_t crc;
@@ -103 +104 @@
  fill = 0;
  for (i = 0; i < 4; i++) {
-  s |= data[i] << fill;
+  // data is 16 bit long
+  s |= data[i] << (fill & 0xFFFF);
   fill += 16;
 
-  crc = rdtcs_rds_crc_calc(data[i]);
+  crc = rdtcs_rds_crc_calc(data[i], block[i]);
 
-  s |= crc << fill;
+  // CRC is 10 bit long
+  s |= crc << (fill & 0x03FF);
   fill += 10;
 
+  // shift all complet bytes we allready have out
   while (fill >= 8) {
    *c     = s & 0xFF;
@@ -122 +126 @@
 }
 
-uint16_t rdtcs_rds_crc_calc      (uint16_t data) {
+uint16_t rdtcs_rds_crc_calc      (uint16_t data, int block) {
  return 0xAAAA;
 }