Change marketing stuff

unicens -> UNICENS
MicroChip -> Microchip

Change-Id: I7a2f48ac62f44579831ed252b5e24dc918c09645
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

3 files changed, 98 insertions, 98 deletions

diff --git a/ucs2-afb/ucs_apidef.json b/ucs2-afb/ucs_apidef.json
index 5a3e81e..5aa33a2 100644
--- a/ucs2-afb/ucs_apidef.json
+++ b/ucs2-afb/ucs_apidef.json
@@ -1,12 +1,12 @@
 {
   "openapi": "3.0.0",
-  "$schema": "file:///home/fulup/Workspace/AGL-AppFW/unicens2rc-afb/etc/openapi-schema.json", 
+  "$schema": "file:///home/fulup/Workspace/AGL-AppFW/unicens2rc-afb/etc/openapi-schema.json",
   "info": {
     "description": "",
     "title": "ucs2",
     "version": "1.0",
     "x-binding-c-generator": {
-      "api": "unicens",
+      "api": "UNICENS",
       "version": 2,
       "prefix": "ucs2_",
       "postfix": "",
@@ -14,7 +14,7 @@
       "onevent": null,
       "init": null,
       "scope": "static",
-      "private": true      
+      "private": true
     }
   },
   "servers": [
@@ -82,10 +82,10 @@
     },
     "x-permissions": {
         "config": {
-          "permission": "urn:AGL:permission:unicens:public:initialise"
+          "permission": "urn:AGL:permission:UNICENS:public:initialise"
         },
         "monitor": {
-          "permission": "urn:AGL:permission:unicens:public:monitor"
+          "permission": "urn:AGL:permission:UNICENS:public:monitor"
         }
     },
     "responses": {
@@ -117,7 +117,7 @@
           }
         ],
         "responses": {
-          "200": {"$ref": "#/components/responses/200"} 
+          "200": {"$ref": "#/components/responses/200"}
         }
       }
     },
@@ -128,7 +128,7 @@
           "$ref": "#/components/x-permissions/monitor"
         },
         "responses": {
-          "200": {"$ref": "#/components/responses/200"} 
+          "200": {"$ref": "#/components/responses/200"}
         }
       }
     }
diff --git a/ucs2-afb/ucs_apihat.c b/ucs2-afb/ucs_apihat.c
index ff6a5cd..9dfd050 100644
--- a/ucs2-afb/ucs_apihat.c
+++ b/ucs2-afb/ucs_apihat.c
@@ -39,8 +39,8 @@ static const struct afb_verb_desc_v1 binding_verbs[] = {
   { .name= "initialise", .session= AFB_SESSION_NONE,  .callback= ucs2Init,      .info= "Parse XML & initialise Unicens " },
   { .name= "setvol"    , .session= AFB_SESSION_NONE,  .callback= ucs2SetVol,    .info= "Set Volume" },
  //  { .name= "monitor"   , .session= AFB_SESSION_NONE,  .callback= ucs2Monitor,   .info= "Subscribe to network error" },
- 
-  
+
+
   { .name= NULL } /* marker for end of the array */
 };
 
@@ -51,10 +51,10 @@ static const struct afb_binding binding_description = {
   /* description conforms to VERSION 1 */
   .type= AFB_BINDING_VERSION_1,
   .v1= {
-    .prefix= "unicens",
-    .info= "Unicens MOST Control API",
+    .prefix= "UNICENS",
+    .info= "UNICENS MOST Control API",
     .verbs = binding_verbs
-  } 
+  }
 };
 
 // this is call when after all bindings are loaded
@@ -68,7 +68,7 @@ static const struct afb_binding binding_description = {
  */
  const struct afb_binding *afbBindingV1Register(const struct afb_binding_interface *itf) {
     afbIface= itf;
-    
+
     return &binding_description;	/* returns the description of the binding */
 }
 
diff --git a/ucs2-afb/ucs_binding.c b/ucs2-afb/ucs_binding.c
index 9be4a1b..c1a0a06 100644
--- a/ucs2-afb/ucs_binding.c
+++ b/ucs2-afb/ucs_binding.c
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * references:
  *   https://gist.github.com/ghedo/963382
  *   http://alsa-utils.sourcearchive.com/documentation/1.0.15/aplay_8c-source.html
@@ -76,20 +76,20 @@ PUBLIC uint16_t UCSI_CB_OnGetTime(void *pTag) {
     struct timespec currentTime;
     uint16_t timer;
     pTag = pTag;
-    
+
     if (clock_gettime(CLOCK_MONOTONIC_RAW, &currentTime))   {
         assert(false);
         return 0;
     }
-    
+
     timer = (uint16_t) ((currentTime.tv_sec * 1000 ) + ( currentTime.tv_nsec / 1000000 ));
-    return(timer);        
+    return(timer);
 }
 
 STATIC int onTimerCB (sd_event_source* source,uint64_t timer, void* pTag) {
     ucsContextT *ucsContext = (ucsContextT*) pTag;
 
-    sd_event_source_unref(source);    
+    sd_event_source_unref(source);
     UCSI_Timeout(&ucsContext->ucsiData);
 
     return 0;
@@ -98,10 +98,10 @@ STATIC int onTimerCB (sd_event_source* source,uint64_t timer, void* pTag) {
 // UCS2 Interface Timer Callback
 PUBLIC void UCSI_CB_OnSetServiceTimer(void *pTag, uint16_t timeout) {
   uint64_t usec;
-  // set a timer with  250ms accuracy 
-  sd_event_now(afb_daemon_get_event_loop(afbIface->daemon), CLOCK_BOOTTIME, &usec);  
+  // set a timer with  250ms accuracy
+  sd_event_now(afb_daemon_get_event_loop(afbIface->daemon), CLOCK_BOOTTIME, &usec);
   sd_event_add_time(afb_daemon_get_event_loop(afbIface->daemon), NULL, CLOCK_MONOTONIC, usec + (timeout*1000), 250, onTimerCB, pTag);
-    
+
 }
 
 /**
@@ -124,7 +124,7 @@ void UCSI_CB_OnUserMessage(void *pTag, const char format[],
 // UCSI_Service cannot be call directly within Unicens context, need to reset stack through mainloop
 STATIC int OnServiceRequiredCB (sd_event_source *source, uint64_t usec, void *pTag) {
     ucsContextT *ucsContext = (ucsContextT*) pTag;
-    
+
     sd_event_source_unref(source);
     UCSI_Service(&ucsContext->ucsiData);
     return (0);
@@ -132,7 +132,7 @@ STATIC int OnServiceRequiredCB (sd_event_source *source, uint64_t usec, void *pT
 
 // UCS Callback fire when ever pTag instance needs to be serviced
 PUBLIC void UCSI_CB_OnServiceRequired(void *pTag) {
-    
+
    // push an asynchronous request for loopback to call UCSI_Service
    sd_event_add_time(afb_daemon_get_event_loop(afbIface->daemon), NULL, CLOCK_MONOTONIC, 0, 0, OnServiceRequiredCB, pTag);
 }
@@ -147,7 +147,7 @@ PUBLIC void UCSI_CB_OnServiceRequired(void *pTag) {
 PUBLIC void UCSI_CB_OnMostError(void *pTag, uint16_t sourceAddr,
     uint8_t fblock, uint8_t inst, uint16_t function, uint8_t op,
     const uint8_t *pPayload, uint32_t payloadLen) {
-    
+
     // Error to send to syslog
     DEBUG (afbIface, "OnMostError source=0x%x", sourceAddr);
 }
@@ -157,20 +157,20 @@ PUBLIC void UCSI_CB_OnMostError(void *pTag, uint16_t sourceAddr,
 // Callback when ever this instance wants to send a message to INIC.
 // BUGS?? Sample was returning true/false on error when integration layer expect a void [question from Fulup to Thorsten]
 PUBLIC void UCSI_CB_SendMostMessage(void *pTag, const uint8_t *pData, uint32_t len) {
-    
+
     ucsContextT *ucsContext = (ucsContextT*) pTag;
     CdevData_t *cdevTx = &ucsContext->tx;
     uint32_t total = 0;
-    
-    
+
+
     if (NULL == pData || 0 == len) return;
-    
+
     if (O_RDONLY == cdevTx->fileFlags) return;
     if (-1 == cdevTx->fileHandle)
         cdevTx->fileHandle = open(cdevTx->fileName, cdevTx->fileFlags);
     if (-1 == cdevTx->fileHandle)
         return;
-    
+
     while(total < len) {
         ssize_t written = write(cdevTx->fileHandle, &pData[total], (len - total));
         if (0 >= written)
@@ -180,8 +180,8 @@ PUBLIC void UCSI_CB_SendMostMessage(void *pTag, const uint8_t *pData, uint32_t l
         }
         total += (uint32_t) written;
     }
-    
-    return;    
+
+    return;
 }
 
 /**
@@ -193,7 +193,7 @@ PUBLIC void UCSI_CB_SendMostMessage(void *pTag, const uint8_t *pData, uint32_t l
  */
 void UCSI_CB_OnStop(void *pTag) {
     NOTICE (afbIface, "Unicens stopped");
-    
+
 }
 
 /**
@@ -205,31 +205,31 @@ void UCSI_CB_OnStop(void *pTag) {
  * \param pNode - Pointer to node structure holding details of changed node
  */
 extern void UCSI_CB_OnMgrReport(void *pTag, Ucs_MgrReport_t code, uint16_t nodeAddress, Ucs_Rm_Node_t *pNode) {
-    
+
     DEBUG (afbIface, "OnMgrReport: Ucs_MgrReport_t=%d nodeAdresse=0x%x", code, nodeAddress);
 }
 
 bool Cdev_Init(CdevData_t *d, const char *fileName, bool read, bool write)
 {
     if (NULL == d || NULL == fileName)  goto OnErrorExit;
-    
+
     memset(d, 0, sizeof(CdevData_t));
     strncpy(d->fileName, fileName, MAX_FILENAME_LEN);
     d->fileHandle = -1;
-    
+
     if (read && write)
         d->fileFlags = O_RDWR | O_NONBLOCK;
     else if (read)
         d->fileFlags = O_RDONLY | O_NONBLOCK;
     else if (write)
         d->fileFlags = O_WRONLY | O_NONBLOCK;
-   
+
     // open file to enable event loop
-    d->fileHandle = open(d->fileName, d->fileFlags);    
+    d->fileHandle = open(d->fileName, d->fileFlags);
     if (d->fileHandle  <= 0) goto OnErrorExit;
-    
+
     return true;
-    
+
  OnErrorExit:
     return false;
 }
@@ -251,7 +251,7 @@ int onReadCB (sd_event_source* src, int fileFd, uint32_t revents, void* pTag) {
     int ok;
 
     len = read (ucsContext->rx.fileHandle, &pBuffer, sizeof(pBuffer));
-    
+
     ok= UCSI_ProcessRxData(&ucsContext->ucsiData, pBuffer, (uint16_t)len);
     if (!ok) {
         DEBUG (afbIface, "Buffer overrun (not handle)");
@@ -265,40 +265,40 @@ STATIC UcsXmlVal_t* ParseFile(struct afb_req request) {
     ssize_t readSize;
     int fdHandle ;
     struct stat fdStat;
-    UcsXmlVal_t* ucsConfig; 
+    UcsXmlVal_t* ucsConfig;
 
     const char *filename = afb_req_value(request, "filename");
     if (!filename) {
         afb_req_fail_f (request, "filename-missing", "No filename given");
-        goto OnErrorExit;            
+        goto OnErrorExit;
     }
-    
+
     fdHandle = open(filename, O_RDONLY);
     if (fdHandle <= 0) {
         afb_req_fail_f (request, "fileread-error", "File not accessible: '%s' err=%s", filename, strerror(fdHandle));
         goto OnErrorExit;
     }
-    
+
     // read file into buffer as a \0 terminated string
     fstat(fdHandle, &fdStat);
     xmlBuffer = (char*)alloca(fdStat.st_size + 1);
     readSize = read(fdHandle, xmlBuffer, fdStat.st_size);
     close(fdHandle);
     xmlBuffer[readSize] = '\0'; //In any case, terminate it.
-    
+
     if (readSize != fdStat.st_size)  {
         afb_req_fail_f (request, "fileread-fail", "File to read fullfile '%s' size(%d!=%d)", filename, readSize, fdStat.st_size);
         goto OnErrorExit;
     }
-   
+
     ucsConfig = UcsXml_Parse(xmlBuffer);
     if (!ucsConfig)  {
         afb_req_fail_f (request, "filexml-error", "File XML invalid: '%s'", filename);
         goto OnErrorExit;
     }
-    
+
     return (ucsConfig);
-    
+
  OnErrorExit:
     return NULL;
 }
@@ -328,21 +328,21 @@ STATIC int volSndCmd (struct afb_req request, struct json_object *commandJ, ucsC
         case json_type_array:
             if (!sscanf (json_object_get_string (json_object_array_get_idx(commandJ, 0)), "%d", &numid)) {
                 afb_req_fail_f (request, "channel-invalid","command=%s channel is not an integer", json_object_get_string (channelJ));
-                goto OnErrorExit;                        
-            }            
+                goto OnErrorExit;
+            }
             if (!sscanf (json_object_get_string (json_object_array_get_idx(commandJ, 1)), "%d", &vol)) {
                 afb_req_fail_f (request, "vol-invalid","command=%s vol is not an integer", json_object_get_string (channelJ));
-                goto OnErrorExit;                        
-            }            
+                goto OnErrorExit;
+            }
             break;
-            
-        case json_type_object:  
+
+        case json_type_object:
             if (json_object_object_get_ex (commandJ, "numid", &channelJ)) {
                 if (!sscanf (json_object_get_string (channelJ), "%d", &numid)) {
                     afb_req_fail_f (request, "channel-invalid","command=%s numid is not an integer", json_object_get_string (channelJ));
-                    goto OnErrorExit;                        
-                }            
-            } else {    
+                    goto OnErrorExit;
+                }
+            } else {
                 if (json_object_object_get_ex (commandJ, "channel", &nameJ)) {
                     int idx;
                     const char *name = json_object_get_string(nameJ);
@@ -355,85 +355,85 @@ STATIC int volSndCmd (struct afb_req request, struct json_object *commandJ, ucsC
                     }
                     if (ucsContext->channels[idx].name == NULL) {
                         afb_req_fail_f (request, "channel-invalid","command=%s channel name does not exist", name);
-                        goto OnErrorExit;            
-                    }            
+                        goto OnErrorExit;
+                    }
                 } else {
                     afb_req_fail_f (request, "channel-invalid","command=%s no valid channel name or channel", json_object_get_string(commandJ));
-                    goto OnErrorExit;            
+                    goto OnErrorExit;
                 };
             }
-            
+
             if (!json_object_object_get_ex (commandJ, "volume", &volJ)) {
                 afb_req_fail_f (request, "vol-missing","command=%s vol not present", json_object_get_string (commandJ));
-                goto OnErrorExit;                        
+                goto OnErrorExit;
             }
-    
+
             if (!sscanf (json_object_get_string (volJ), "%d", &vol)) {
                 afb_req_fail_f (request, "vol-invalid","command=%s vol:%s is not an integer", json_object_get_string (commandJ), json_object_get_string (volJ));
-                goto OnErrorExit;                        
+                goto OnErrorExit;
             }
 
             break;
-            
-        default:           
+
+        default:
             afb_req_fail_f (request, "setvol-invalid","command=%s not valid JSON Volume Command", json_object_get_string(commandJ));
-            goto OnErrorExit; 
+            goto OnErrorExit;
     }
-    
-    
+
+
     // Fulup what's append when channel or vol are invalid ???
     err = UCSI_Vol_Set  (&ucsContext->ucsiData, numid, (uint8_t) vol);
     if (err) {
         // Fulup this might only be a warning (not sure about it)
-        afb_req_fail_f (request, "vol-refused","command=%s vol was refused by unicens", json_object_get_string (volJ));
-        goto OnErrorExit; 
+        afb_req_fail_f (request, "vol-refused","command=%s vol was refused by UNICENS", json_object_get_string (volJ));
+        goto OnErrorExit;
     }
-    
+
     return 0;
-    
-  OnErrorExit: 
+
+  OnErrorExit:
     return 1;
 }
-    
+
 
 PUBLIC void ucs2SetVol (struct afb_req request) {
     struct json_object *queryJ;
     int err;
-    
-    // check unicens is initialised
+
+    // check UNICENS is initialised
     if (!ucsContextS) {
-        afb_req_fail_f (request, "unicens-init","Should Load Config before using setvol");
-        goto OnErrorExit;                
+        afb_req_fail_f (request, "UNICENS-init","Should Load Config before using setvol");
+        goto OnErrorExit;
     }
-    
+
     queryJ = afb_req_json(request);
     if (!queryJ) {
         afb_req_fail_f (request, "query-notjson","query=%s not a valid json entry", afb_req_value(request,""));
-        goto OnErrorExit;        
+        goto OnErrorExit;
     };
-    
+
     enum json_type jtype= json_object_get_type(queryJ);
     switch (jtype) {
         case json_type_array:
             for (int idx=0; idx < json_object_array_length (queryJ); idx ++) {
-               err= volSndCmd (request, json_object_array_get_idx (queryJ, idx), ucsContextS); 
+               err= volSndCmd (request, json_object_array_get_idx (queryJ, idx), ucsContextS);
                if (err) goto OnErrorExit;
             }
             break;
-            
+
         case json_type_object:
             err = volSndCmd (request, queryJ, ucsContextS);
             if (err) goto OnErrorExit;
             break;
-        
-        default:           
+
+        default:
             afb_req_fail_f (request, "query-notarray","query=%s not valid JSON Volume Command Array", afb_req_value(request,""));
-            goto OnErrorExit;        
+            goto OnErrorExit;
     }
-    
 
-    afb_req_success(request,NULL,NULL); 
-    
+
+    afb_req_success(request,NULL,NULL);
+
  OnErrorExit:
     return;
 }
@@ -445,11 +445,11 @@ PUBLIC void ucs2Init (struct afb_req request) {
 
     sd_event_source *evtSource;
     int err;
-    
+
     // Read and parse XML file
     ucsConfig = ParseFile (request);
     if (NULL == ucsConfig) goto OnErrorExit;
-    
+
     // Fulup->Thorsten BUG InitializeCdevs should fail when control does not exit
     if (!InitializeCdevs(&ucsContext))  {
         afb_req_fail_f (request, "devnit-error", "Fail to initialise device [rx=%s tx=%s]", CONTROL_CDEV_RX, CONTROL_CDEV_TX);
@@ -458,10 +458,10 @@ PUBLIC void ucs2Init (struct afb_req request) {
 
     // Initialise Unicens Config Data Structure
     UCSI_Init(&ucsContext.ucsiData, &ucsContext);
-    
+
     // Initialise Unicens with parsed config
     if (!UCSI_NewConfig(&ucsContext.ucsiData, ucsConfig))   {
-        afb_req_fail_f (request, "unicens-init", "Fail to initialize Unicens");
+        afb_req_fail_f (request, "UNICENS-init", "Fail to initialize Unicens");
         goto OnErrorExit;
     }
 
@@ -471,7 +471,7 @@ PUBLIC void ucs2Init (struct afb_req request) {
         afb_req_fail_f (request, "register-mainloop", "Cannot hook events to mainloop");
         goto OnErrorExit;
     }
-    
+
     // init Unicens Volume Library
     ucsContext.channels = UCSI_Vol_Init (&ucsContext.ucsiData, volumeCB);
     if (!ucsContext.channels) {
@@ -480,9 +480,9 @@ PUBLIC void ucs2Init (struct afb_req request) {
     }
     // save this in a statical variable until ucs2vol move to C
     ucsContextS = &ucsContext;
-            
-    afb_req_success(request,NULL,"unicens-active"); 
-    
+
+    afb_req_success(request,NULL,"UNICENS-active");
+
  OnErrorExit:
     return;
 }