refactored "SampledValuesPublisher" into "SVPublisher" (closes #34)

pull/35/head
Steffen Vogel 8 years ago
parent f7b04a02ed
commit 4c5e1717d1

@ -68,7 +68,7 @@ struct sSV_ASDU {
struct sSampledValuesPublisher { struct sSVPublisher {
uint8_t* buffer; uint8_t* buffer;
uint16_t appId; uint16_t appId;
EthernetSocket ethernetSocket; EthernetSocket ethernetSocket;
@ -86,7 +86,7 @@ struct sSampledValuesPublisher {
static void static void
preparePacketBuffer(SampledValuesPublisher self, CommParameters* parameters, const char* interfaceID) preparePacketBuffer(SVPublisher self, CommParameters* parameters, const char* interfaceID)
{ {
uint8_t srcAddr[6]; uint8_t srcAddr[6];
@ -283,10 +283,10 @@ encodeUtcTime(uint64_t timeval, uint8_t* buffer, int bufPos)
return bufPos + 8; return bufPos + 8;
} }
SampledValuesPublisher SVPublisher
SampledValuesPublisher_create(CommParameters* parameters, const char* interfaceId) SVPublisher_create(CommParameters* parameters, const char* interfaceId)
{ {
SampledValuesPublisher self = (SampledValuesPublisher) GLOBAL_CALLOC(1, sizeof(struct sSampledValuesPublisher)); SVPublisher self = (SVPublisher) GLOBAL_CALLOC(1, sizeof(struct sSVPublisher));
self->asduLIst = NULL; self->asduLIst = NULL;
@ -296,7 +296,7 @@ SampledValuesPublisher_create(CommParameters* parameters, const char* interfaceI
} }
SV_ASDU SV_ASDU
SampledValuesPublisher_addASDU(SampledValuesPublisher self, char* svID, char* datset, uint32_t confRev) SVPublisher_addASDU(SVPublisher self, char* svID, char* datset, uint32_t confRev)
{ {
SV_ASDU newAsdu = (SV_ASDU) GLOBAL_CALLOC(1, sizeof(struct sSV_ASDU)); SV_ASDU newAsdu = (SV_ASDU) GLOBAL_CALLOC(1, sizeof(struct sSV_ASDU));
@ -418,7 +418,7 @@ SV_ASDU_encodeToBuffer(SV_ASDU self, uint8_t* buffer, int bufPos)
} }
void void
SampledValuesPublisher_setupComplete(SampledValuesPublisher self) SVPublisher_setupComplete(SVPublisher self)
{ {
int numberOfAsdu = 0; int numberOfAsdu = 0;
@ -478,7 +478,7 @@ SampledValuesPublisher_setupComplete(SampledValuesPublisher self)
void void
SampledValuesPublisher_publish(SampledValuesPublisher self) SVPublisher_publish(SVPublisher self)
{ {
if (DEBUG_SV_PUBLISHER) if (DEBUG_SV_PUBLISHER)
printf("SV_PUBLISHER: send SV message\n"); printf("SV_PUBLISHER: send SV message\n");
@ -489,7 +489,7 @@ SampledValuesPublisher_publish(SampledValuesPublisher self)
void void
SampledValuesPublisher_destroy(SampledValuesPublisher self) SVPublisher_destroy(SVPublisher self)
{ {
GLOBAL_FREEMEM(self->buffer); GLOBAL_FREEMEM(self->buffer);
} }

@ -51,24 +51,24 @@ typedef struct sCommParameters {
#define IEC61850_SV_SMPMOD_SAMPLES_PER_SECOND 1 #define IEC61850_SV_SMPMOD_SAMPLES_PER_SECOND 1
#define IEC61850_SV_SMPMOD_SECONDS_PER_SAMPLE 2 #define IEC61850_SV_SMPMOD_SECONDS_PER_SAMPLE 2
typedef struct sSampledValuesPublisher* SampledValuesPublisher; typedef struct sSVPublisher* SVPublisher;
typedef struct sSV_ASDU* SV_ASDU; typedef struct sSV_ASDU* SV_ASDU;
SampledValuesPublisher SVPublisher
SampledValuesPublisher_create(CommParameters* parameters, const char* interfaceId); SVPublisher_create(CommParameters* parameters, const char* interfaceId);
SV_ASDU SV_ASDU
SampledValuesPublisher_addASDU(SampledValuesPublisher self, char* svID, char* datset, uint32_t confRev); SVPublisher_addASDU(SVPublisher self, char* svID, char* datset, uint32_t confRev);
void void
SampledValuesPublisher_setupComplete(SampledValuesPublisher self); SVPublisher_setupComplete(SVPublisher self);
void void
SampledValuesPublisher_publish(SampledValuesPublisher self); SVPublisher_publish(SVPublisher self);
void void
SampledValuesPublisher_destroy(SampledValuesPublisher self); SVPublisher_destroy(SVPublisher self);
void void
SV_ASDU_resetBuffer(SV_ASDU self); SV_ASDU_resetBuffer(SV_ASDU self);

Loading…
Cancel
Save