The week-without-the-network changes

1 files changed, 25 insertions, 60 deletions

diff --git a/includes/yazedc.h b/includes/yazedc.h
index b990d3e..298c0eb 100644
--- a/includes/yazedc.h
+++ b/includes/yazedc.h
@@ -22,6 +22,8 @@
 
 #ifndef __YAZEDC_H__
 
+#include "Exceptions.h"
+
 #define RS_L12_BITS 8
 
 /* audio sector definitions for CIRC */
@@ -32,17 +34,6 @@
 #define L1_Q   4
 #define L1_P   4
 
-/* audio sector Cross Interleaved Reed-Solomon Code (CIRC) encoder (layer 1) */
-/* adds P- and Q- parity information to audio (f2) frames. Also
-   optionally handles the various delays and permutations. The output with all
-   stages enabled can be fed into the Eight-Fourteen-Modulator.
-   On input: 2352 bytes of audio data is given.
-   On output: 3136 bytes of CIRC enriched audio data are returned.
- */
-int do_encode_L1(unsigned char in[L1_RAW*FRAMES_PER_SECTOR],
-		unsigned char out[(L1_RAW+L1_Q+L1_P)*FRAMES_PER_SECTOR],
-		int delay1, int delay2, int delay3, int scramble);
-
 /* data sector definitions for RSPC */
 /* user data bytes per frame */
 #define L2_RAW (1024*2)
@@ -57,14 +48,25 @@ int do_encode_L1(unsigned char in[L1_RAW*FRAMES_PER_SECTOR],
 #define MODE_2_FORM_1	3
 #define MODE_2_FORM_2	4
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/* r-w sub channel definitions */
+#define RS_SUB_RW_BITS 6
+
+#define PACKETS_PER_SUBCHANNELFRAME 4
+#define LSUB_RAW 18
+#define LSUB_QRAW 2
+/* 6 bit */
+#define LSUB_Q 2
+#define LSUB_P 4
+
+class yazedc : public Base {
+
+  public:
+      yazedc();
 
 /* set one of the MODE_* constants for subsequent data sector formatting */
-int set_sector_type(int st);
+    int set_sector_type(int st);
 /* get the current sector type setting for data sector formatting */
-int get_sector_type(void);
+    int get_sector_type(void);
 
 /* data sector layer 2 Reed-Solomon Product Code encoder */
 /* encode the given data portion depending on sector type (see
@@ -88,55 +90,18 @@ int get_sector_type(void);
                     in the inout array.
                     Sync-, header- and edc- fields will be added.
 */
-int do_encode_L2(unsigned char *inout, int sectortype, unsigned address);
-int decode_L2_Q(unsigned char inout[4 + L2_RAW + 12 + L2_Q]);
-int decode_L2_P(unsigned char inout[4 + L2_RAW + 12 + L2_Q + L2_P]);
-unsigned long int build_edc(unsigned char inout[], int from, int upto);
+    int do_encode_L2(unsigned char *inout, int sectortype, unsigned address);
 
 /* generates f2 frames from otherwise fully formatted sectors (generated by
    do_encode_L2()). */
-int scramble_L2(unsigned char *inout);
+    int scramble_L2(unsigned char *inout);
 
-#ifdef __cplusplus
-}
-#endif
-
-/* r-w sub channel definitions */
-#define RS_SUB_RW_BITS 6
+    unsigned char minute, second, frame;
 
-#define PACKETS_PER_SUBCHANNELFRAME 4
-#define LSUB_RAW 18
-#define LSUB_QRAW 2
-/* 6 bit */
-#define LSUB_Q 2
-#define LSUB_P 4
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* R-W subchannel encoder */
-/* On input: 72 bytes packed user data, four frames with each 18 bytes.
-   On output: per frame: 2 bytes user data, 2 bytes Q parity, 
-                         16 bytes user data, 4 bytes P parity.
-   Options:
-     delay1: use low level delay line
-     scramble: perform low level permutations
- */
-int do_encode_sub(unsigned char in[LSUB_RAW*PACKETS_PER_SUBCHANNELFRAME],
-		unsigned char out[(LSUB_RAW+LSUB_Q+LSUB_P)*PACKETS_PER_SUBCHANNELFRAME],
-		int delay1, int scramble);
-int do_decode_sub(unsigned char in[(LSUB_RAW+LSUB_Q+LSUB_P)*PACKETS_PER_SUBCHANNELFRAME],
-		unsigned char out[LSUB_RAW*PACKETS_PER_SUBCHANNELFRAME],
-		int delay1, int scramble);
-
-int decode_LSUB_Q(unsigned char inout[LSUB_QRAW + LSUB_Q]);
-int decode_LSUB_P(unsigned char inout[LSUB_RAW + LSUB_Q + LSUB_P]);
-
-#ifdef __cplusplus
-}
-#endif
+  private:
+    int sectortype;
+    int build_address(unsigned char inout[], int sectortype, unsigned address);
 
-extern unsigned char minute, second, frame;
+};
 
 #endif