|
52 | 52 |
|
53 | 53 | // ----
|
54 | 54 |
|
| 55 | +#define _PICOBIN_INDEX_TO_BITS(y, x) (y ## x << y ## _LSB) |
55 | 56 | #define PICOBIN_INDEX_TO_BITS(y, x) (y ## _ ## x << y ## _LSB)
|
56 | 57 |
|
57 | 58 | #define PICOBIN_IMAGE_TYPE_IMAGE_TYPE_LSB _u(0)
|
58 | 59 | #define PICOBIN_IMAGE_TYPE_IMAGE_TYPE_BITS _u(0x000f)
|
59 | 60 | #define PICOBIN_IMAGE_TYPE_IMAGE_TYPE_INVALID _u(0x0)
|
60 | 61 | #define PICOBIN_IMAGE_TYPE_IMAGE_TYPE_EXE _u(0x1)
|
61 | 62 | #define PICOBIN_IMAGE_TYPE_IMAGE_TYPE_DATA _u(0x2)
|
62 |
| -#define PICOBIN_IMAGE_TYPE_IMAGE_TYPE_AS_BITS(x) PICOBIN_INDEX_TO_BITS(PICOBIN_IMAGE_TYPE_IMAGE_TYPE, x) |
| 63 | +#define PICOBIN_IMAGE_TYPE_IMAGE_TYPE_AS_BITS(x) _PICOBIN_INDEX_TO_BITS(PICOBIN_IMAGE_TYPE_IMAGE_TYPE, _ ## x) |
63 | 64 |
|
64 | 65 | #define PICOBIN_IMAGE_TYPE_EXE_SECURITY_LSB _u(4)
|
65 | 66 | #define PICOBIN_IMAGE_TYPE_EXE_SECURITY_BITS _u(0x0030)
|
66 | 67 | #define PICOBIN_IMAGE_TYPE_EXE_SECURITY_UNSPECIFIED _u(0x0)
|
67 | 68 | #define PICOBIN_IMAGE_TYPE_EXE_SECURITY_NS _u(0x1)
|
68 | 69 | #define PICOBIN_IMAGE_TYPE_EXE_SECURITY_S _u(0x2)
|
69 |
| -#define PICOBIN_IMAGE_TYPE_EXE_SECURITY_AS_BITS(x) PICOBIN_INDEX_TO_BITS(PICOBIN_IMAGE_TYPE_EXE_SECURITY, x) |
| 70 | +#define PICOBIN_IMAGE_TYPE_EXE_SECURITY_AS_BITS(x) _PICOBIN_INDEX_TO_BITS(PICOBIN_IMAGE_TYPE_EXE_SECURITY, _ ## x) |
70 | 71 |
|
71 | 72 | #define PICOBIN_IMAGE_TYPE_EXE_CPU_LSB _u(8)
|
72 | 73 | #define PICOBIN_IMAGE_TYPE_EXE_CPU_BITS _u(0x0700)
|
73 | 74 | #define PICOBIN_IMAGE_TYPE_EXE_CPU_ARM _u(0)
|
74 | 75 | #define PICOBIN_IMAGE_TYPE_EXE_CPU_RISCV _u(1)
|
75 | 76 | #define PICOBIN_IMAGE_TYPE_EXE_CPU_VARMULET _u(2)
|
76 |
| -#define PICOBIN_IMAGE_TYPE_EXE_CPU_AS_BITS(x) PICOBIN_INDEX_TO_BITS(PICOBIN_IMAGE_TYPE_EXE_CPU, x) |
| 77 | +#define PICOBIN_IMAGE_TYPE_EXE_CPU_AS_BITS(x) _PICOBIN_INDEX_TO_BITS(PICOBIN_IMAGE_TYPE_EXE_CPU, _ ## x) |
77 | 78 |
|
78 | 79 | #define PICOBIN_IMAGE_TYPE_EXE_CHIP_LSB _u(12)
|
79 | 80 | #define PICOBIN_IMAGE_TYPE_EXE_CHIP_BITS _u(0x7000)
|
80 | 81 | #define PICOBIN_IMAGE_TYPE_EXE_CHIP_RP2040 _u(0)
|
81 | 82 | #define PICOBIN_IMAGE_TYPE_EXE_CHIP_RP2350 _u(1)
|
82 |
| -#define PICOBIN_IMAGE_TYPE_EXE_CHIP_AS_BITS(x) PICOBIN_INDEX_TO_BITS(PICOBIN_IMAGE_TYPE_EXE_CHIP, x) |
| 83 | +#define PICOBIN_IMAGE_TYPE_EXE_CHIP_AS_BITS(x) _PICOBIN_INDEX_TO_BITS(PICOBIN_IMAGE_TYPE_EXE_CHIP, _ ## x) |
83 | 84 |
|
84 | 85 | #define PICOBIN_IMAGE_TYPE_EXE_TBYB_BITS _u(0x8000)
|
85 | 86 |
|
|
135 | 136 | #define PICOBIN_PARTITION_FLAGS_LINK_TYPE_NONE _u(0)
|
136 | 137 | #define PICOBIN_PARTITION_FLAGS_LINK_TYPE_A_PARTITION _u(1)
|
137 | 138 | #define PICOBIN_PARTITION_FLAGS_LINK_TYPE_OWNER_PARTITION _u(2)
|
138 |
| -#define PICOBIN_PARTITION_FLAGS_LINK_TYPE_AS_BITS(x) PICOBIN_INDEX_TO_BITS(PICOBIN_PARTITION_FLAGS_LINK_TYPE, x) |
| 139 | +#define PICOBIN_PARTITION_FLAGS_LINK_TYPE_AS_BITS(x) _PICOBIN_INDEX_TO_BITS(PICOBIN_PARTITION_FLAGS_LINK_TYPE, _ ## x) |
139 | 140 |
|
140 | 141 |
|
141 | 142 | #define PICOBIN_HASH_SHA256 _u(0x01)
|
|
0 commit comments