From 03774c4e3033235d7fab446c6a6d8a9cf3ce4803 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 29 Oct 2015 10:16:46 +0100 Subject: Move status into csta --- Makefile | 3 ++- csta.erl | 5 ++++- rose.erl | 2 +- status.erl | 5 ----- 4 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 status.erl diff --git a/Makefile b/Makefile index 6499554..3e85201 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,8 @@ ASN1 = ACSE-1.asn1 \ CSTA-call-connection-identifiers.asn1 \ CSTA-extension-types.asn1 \ CSTA-security.asn1 \ - CSTA-escape-service.asn1 + CSTA-escape-service.asn1 \ + CSTA-snapshot-device.asn1 SRCS = $(ASN1:.asn1=.erl) HDRS = $(ASN1:.asn1=.hrl) diff --git a/csta.erl b/csta.erl index 7eefbb2..6aa904a 100644 --- a/csta.erl +++ b/csta.erl @@ -1,6 +1,6 @@ -module(csta). --export([lines/1, decode/1]). +-export([lines/1, decode/1, status/0]). -include("CSTA-escape-service.hrl"). @@ -18,3 +18,6 @@ lines(Device) -> privateData = {private, {kmeSystemData, {getSystemData, {request, {deviceList, {category, {standardDevice, Device}}}}}}}}). + +status() -> + 'CSTA-system-status':encode('SystemStatusRes', {noData, []}). diff --git a/rose.erl b/rose.erl index a367ee0..908f217 100644 --- a/rose.erl +++ b/rose.erl @@ -27,7 +27,7 @@ dispatch({invoke, #'Invoke'{invokeId = Id, opcode = Op, argument = Data}}) -> {local, 71} -> ok; {local, 211} -> - return(Id, Op, status:status()); + return(Id, Op, csta:status()); _ -> error end; diff --git a/status.erl b/status.erl deleted file mode 100644 index 8cd01dd..0000000 --- a/status.erl +++ /dev/null @@ -1,5 +0,0 @@ --module(status). --export([status/0]). - -status() -> - 'CSTA-system-status':encode('SystemStatusRes', {noData, []}). -- cgit v1.2.3