Rename hk=>smo
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
#ifndef HK_PREPROCESSOR_H
|
||||
#define HK_PREPROCESSOR_H
|
||||
#ifndef SMO_PREPROCESSOR_H
|
||||
#define SMO_PREPROCESSOR_H
|
||||
|
||||
#define HK_Q(x) #x
|
||||
#define HK_QUOTE(x) HK_Q(x)
|
||||
#define SMO_Q(x) #x
|
||||
#define SMO_QUOTE(x) SMO_Q(x)
|
||||
|
||||
#define HK_CONCAT(a, b) a ## b
|
||||
#define SMO_CONCAT(a, b) a ## b
|
||||
|
||||
#define HK_UNMANGLED "C"
|
||||
#define SMO_UNMANGLED "C"
|
||||
|
||||
#endif // HK_PREPROCESSOR_H
|
||||
#endif // SMO_PREPROCESSOR_H
|
||||
|
||||
+17
-17
@@ -5,7 +5,7 @@
|
||||
#include <stdbool.h>
|
||||
#include <user/senseDeviceSpec.h>
|
||||
|
||||
namespace hk {
|
||||
namespace smo {
|
||||
namespace sense_api {
|
||||
|
||||
typedef int (sal_mlo_initializeIndFn)(void);
|
||||
@@ -15,15 +15,15 @@ typedef int (sal_mlo_detachDeviceReqFn)(const device::SenseDeviceSpec &desc);
|
||||
|
||||
struct Sal_Mgmt_LibOps
|
||||
{
|
||||
/* When Harikoff loads a sense API lib, it calls this function to initialize
|
||||
/* When Salmanoff loads a sense API lib, it calls this function to initialize
|
||||
* the lib. When this returns, the lib should be ready to attach devices.
|
||||
*/
|
||||
sal_mlo_initializeIndFn *initializeInd;
|
||||
/* Harikoff calls this to finalize the lib and free its internal
|
||||
/* Salmanoff calls this to finalize the lib and free its internal
|
||||
* resources. When this returns, the lib should be ready to be unloaded.
|
||||
*/
|
||||
sal_mlo_finalizeIndFn *finalizeInd;
|
||||
/* Harikoff calls this to attach a device to the lib. When it returns, the
|
||||
/* Salmanoff calls this to attach a device to the lib. When it returns, the
|
||||
* device should be attached and ready to be implexed.
|
||||
*/
|
||||
sal_mlo_attachDeviceReqFn *attachDeviceReq;
|
||||
@@ -42,7 +42,7 @@ struct Sal_Mgmt_LibOps
|
||||
}
|
||||
};
|
||||
|
||||
/* Exported by all sense API Libraries to tell Harikoff what API the lib uses
|
||||
/* Exported by all sense API Libraries to tell Salmanoff what API the lib uses
|
||||
* to connect to providers; and also to state which implexor APIs it exports.
|
||||
*/
|
||||
class SenseApiDesc
|
||||
@@ -92,23 +92,23 @@ public:
|
||||
};
|
||||
|
||||
|
||||
#define HK_GET_SENSE_API_DESC_FN_NAME getSenseApiDesc
|
||||
#define HK_GET_SENSE_API_DESC_FN_NAME_STR \
|
||||
HK_QUOTE(HK_GET_SENSE_API_DESC_FN_NAME)
|
||||
#define HK_GET_SENSE_API_DESC_FN_TYPEDEF \
|
||||
HK_CONCAT(HK_GET_SENSE_API_DESC_FN_NAME, Fn)
|
||||
#define SMO_GET_SENSE_API_DESC_FN_NAME getSenseApiDesc
|
||||
#define SMO_GET_SENSE_API_DESC_FN_NAME_STR \
|
||||
SMO_QUOTE(SMO_GET_SENSE_API_DESC_FN_NAME)
|
||||
#define SMO_GET_SENSE_API_DESC_FN_TYPEDEF \
|
||||
SMO_CONCAT(SMO_GET_SENSE_API_DESC_FN_NAME, Fn)
|
||||
|
||||
/* Every Sense API library must define a global instance of this
|
||||
* function. Harikoff will search for it and invoke it via dlsym().
|
||||
* function. Salmanoff will search for it and invoke it via dlsym().
|
||||
*
|
||||
* The function must return a SenseApiDesc struct that Hk will tell
|
||||
* Hk what implexors can be used with it & what APIs it exports.
|
||||
* The SenseApiDesc struct also gives Hk pointers to API functions
|
||||
* to invoke for communication between Hk and the library.
|
||||
* The function must return a SenseApiDesc struct that Smo will tell
|
||||
* Smo what implexors can be used with it & what APIs it exports.
|
||||
* The SenseApiDesc struct also gives Smo pointers to API functions
|
||||
* to invoke for communication between Smo and the library.
|
||||
*/
|
||||
typedef const SenseApiDesc &(HK_GET_SENSE_API_DESC_FN_TYPEDEF)(void);
|
||||
typedef const SenseApiDesc &(SMO_GET_SENSE_API_DESC_FN_TYPEDEF)(void);
|
||||
|
||||
} // namespace sense_api
|
||||
} // namespace hk
|
||||
} // namespace smo
|
||||
|
||||
#endif // __USER_SENSE_API_LIB_H__
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
namespace hk {
|
||||
namespace smo {
|
||||
namespace device {
|
||||
|
||||
class SenseDeviceSpec
|
||||
@@ -72,6 +72,6 @@ class ExtrospectorDeviceSpec : public SenseDeviceSpec
|
||||
};
|
||||
|
||||
} // namespace device
|
||||
} // namespace hk
|
||||
} // namespace smo
|
||||
|
||||
#endif // SENSORDEVICESPEC_H
|
||||
|
||||
Reference in New Issue
Block a user