peripherals simplify
modules/tinyState/trunk/src/classes/ts/c/tsUSBsystem.c (diff)
modules/tinyState/trunk/src/h/ts/c/stdPeripherals.h (diff)| @@ -126,7 +126,7 @@ | ||
| 126 | 126 | THIS->recv->pkt.peri.h.time = now_stdInterval(); |
| 127 | 127 | (*THIS->pkt->send)(THIS->pkt,0,THIS->recv,0); |
| 128 | 128 | return rDO|ACT_FINISH; |
| 129 | - case PERI_ADDR_SITE_LIST: | |
| 129 | + case PERI_ADDR_DEVTYPE_LIST: | |
| 130 | 130 | return activeList_tsUSBsystem(THIS,0, |
| 131 | 131 | THIS->recv->pkt.peri.sys_list.addr); |
| 132 | 132 | case PERI_ADDR_DEVSET_LIST: |
| @@ -6,12 +6,16 @@ | ||
| 6 | 6 | #define PERI_START_BYTE 0x04 |
| 7 | 7 | #define PERI_STOP_BYTE 0x05 |
| 8 | 8 | |
| 9 | -#define PERI_ADDR_SITE ((uint32_t)0xff000000) | |
| 9 | +#define PERI_ADDR_DEVTYPE ((uint32_t)0xff000000) | |
| 10 | 10 | #define PERI_ADDR_DEVSET ((uint32_t)0xffff0000) |
| 11 | 11 | #define PERI_ADDR_DEVICE ((uint32_t)0xffffff00) |
| 12 | 12 | |
| 13 | 13 | #define PERI_DEVICE_SYSTEM ((uint32_t)0xffffff00) |
| 14 | 14 | |
| 15 | +#define PERI_DEVTYPE(x) (((x)>>24)&0xff) | |
| 16 | +#define PERI_DEVSET(x) (((x)>>16)&0xff) | |
| 17 | +#define PERI_DEVICE(x) (((x)>>8)&0xff) | |
| 18 | + | |
| 15 | 19 | #pragma pack(1) |
| 16 | 20 | |
| 17 | 21 | typedef struct _stdPeripherals_header { |
| @@ -51,7 +55,7 @@ | ||
| 51 | 55 | #define PERI_FMT_DOUBLE (0xc0|PERI_FMT_SIGNED) |
| 52 | 56 | #define PERI_FMT_STRING 0xe0 |
| 53 | 57 | #define PERI_FMT_CUSTOM 0xf0 |
| 54 | - uint8_t seq; | |
| 58 | + int8_t seq; | |
| 55 | 59 | uint8_t length; |
| 56 | 60 | uint32_t addr; |
| 57 | 61 | INTEGER64 time; |
| @@ -130,7 +134,7 @@ | ||
| 130 | 134 | #define PERI_ADDR_SYSTEM_BUF_SIZE (PERI_DEVICE_SYSTEM|0x00) |
| 131 | 135 | #define PERI_ADDR_SYSTEM_WIN_SIZE (PERI_DEVICE_SYSTEM|0x01) |
| 132 | 136 | |
| 133 | -#define PERI_ADDR_SITE_LIST (PERI_DEVICE_SYSTEM|0xff) | |
| 137 | +#define PERI_ADDR_DEVTYPE_LIST (PERI_DEVICE_SYSTEM|0xff) | |
| 134 | 138 | #define PERI_ADDR_DEVSET_LIST (PERI_DEVICE_SYSTEM|0xfe) |
| 135 | 139 | #define PERI_ADDR_DEVICE_LIST (PERI_DEVICE_SYSTEM|0xfd) |
| 136 | 140 | #define PERI_ADDR_ADDR_LIST (PERI_DEVICE_SYSTEM|0xfc) |
