Merge "Distinguish libhwbinder log tags."
diff --git a/include/hwbinder/IBinder.h b/include/hwbinder/IBinder.h
index 3f4c1f6..89bfe88 100644
--- a/include/hwbinder/IBinder.h
+++ b/include/hwbinder/IBinder.h
@@ -24,14 +24,6 @@
#include <utils/String16.h>
#include <utils/Vector.h>
-
-// linux/binder.h already defines this, but we can't just include it from there
-// because there are host builds that include this file.
-#ifndef B_PACK_CHARS
-#define B_PACK_CHARS(c1, c2, c3, c4) \
- ((((c1)<<24)) | (((c2)<<16)) | (((c3)<<8)) | (c4))
-#endif // B_PACK_CHARS
-
// ---------------------------------------------------------------------------
namespace android {
namespace hardware {
@@ -54,14 +46,6 @@
using TransactCallback = std::function<void(Parcel&)>;
enum {
- /////////////////// User defined transactions
- FIRST_CALL_TRANSACTION = 0x00000001,
- LAST_CALL_TRANSACTION = 0x00efffff,
- /////////////////// HIDL reserved
- FIRST_HIDL_TRANSACTION = 0x00f00000,
- HIDL_DESCRIPTOR_CHAIN_TRANSACTION = FIRST_HIDL_TRANSACTION,
- LAST_HIDL_TRANSACTION = 0x00ffffff,
-
// Corresponds to TF_ONE_WAY -- an asynchronous call.
FLAG_ONEWAY = 0x00000001
};
