Changeset 6001:872d916b8ca0 in roaraudio for libroarlight/roardmx.c

Timestamp:

04/06/14 07:00:26 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added some support for CONTROL messages to libroarlight's RoarDMX support

File:

• libroarlight/roardmx.c (modified) (1 diff)

libroarlight/roardmx.c

@@ -561 +561 @@
 
 // * CONTROL:
-// Not yet supported.
+static inline int roar_roardmx_message_new_control(struct roar_roardmx_message * mes, uint8_t subcommand) {
+ BCHK(mes);
+
+ if ( roar_roardmx_message_new(mes) == -1 )
+  return -1;
+
+ mes->type = ROAR_ROARDMX_TYPE_CONTROL;
+ mes->data[3] = 0; // version
+ mes->data[4] = subcommand;
+ mes->length  = 2;
+
+ return 0;
+}
+
+int roar_roardmx_message_new_version(struct roar_roardmx_message * mes, uint8_t version) {
+ BCHK(mes);
+
+ if ( version != (uint8_t)0 ) {
+  roar_err_set(ROAR_ERROR_NSVERSION);
+  return -1;
+ }
+
+ if ( roar_roardmx_message_new_control(mes, ROAR_ROARDMX_CTL_VERSION) == -1 )
+  return -1;
+
+ mes->data[5] = version;
+ mes->length  = 3;
+
+ return 0;
+}
+
+int roar_roardmx_message_new_sync(struct roar_roardmx_message * mes, uint8_t flags) {
+ BCHK(mes);
+
+ if ( roar_roardmx_message_new_control(mes, ROAR_ROARDMX_CTL_VERSION) == -1 )
+  return -1;
+
+ mes->data[5] = flags;
+ mes->length  = 3;
+
+ return 0;
+}
+
+int roar_roardmx_message_get_subcommand(struct roar_roardmx_message * mes) {
+ BCHK(mes);
+
+ if ( mes->type != ROAR_ROARDMX_TYPE_CONTROL ) {
+  roar_err_set(ROAR_ERROR_TYPEMM);
+  return -1;
+ }
+
+ if ( mes->length < 2 ) {
+  roar_err_set(ROAR_ERROR_PROTO);
+  return -1;
+ }
+
+ if ( mes->data[3] != 0 ) {
+  roar_err_set(ROAR_ERROR_NSVERSION);
+  return -1;
+ }
+
+ return mes->data[4];
+}
+
+static inline int roar_roardmx_message_get_ctl_byte5(struct roar_roardmx_message * mes, uint8_t subtype) {
+ BCHK(mes);
+
+ if ( mes->type != ROAR_ROARDMX_TYPE_CONTROL ) {
+  roar_err_set(ROAR_ERROR_TYPEMM);
+  return -1;
+ }
+
+ if ( roar_roardmx_message_get_subcommand(mes) != (int)(unsigned)subtype ) {
+  roar_err_set(ROAR_ERROR_TYPEMM);
+  return -1;
+ }
+
+ return mes->data[5];
+}
+
+int roar_roardmx_message_get_ctl_version(struct roar_roardmx_message * mes) {
+ return roar_roardmx_message_get_ctl_byte5(mes, ROAR_ROARDMX_CTL_VERSION);
+}
+
+int roar_roardmx_message_get_ctl_flags(struct roar_roardmx_message * mes) {
+ return roar_roardmx_message_get_ctl_byte5(mes, ROAR_ROARDMX_CTL_SYNC);
+}
 
 //ll