diff --git a/libsigrok4DSL/hardware/DSL/dsl.h b/libsigrok4DSL/hardware/DSL/dsl.h index 0ae0cca2..8a63275c 100644 --- a/libsigrok4DSL/hardware/DSL/dsl.h +++ b/libsigrok4DSL/hardware/DSL/dsl.h @@ -365,63 +365,63 @@ struct DSL_channels { static const struct DSL_channels channel_modes[] = { // LA Stream - {DSL_STREAM20x16, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 16, 1, SR_KHZ(10), SR_MHZ(20), + {DSL_STREAM20x16, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 16, 1, SR_KHZ(50), SR_MHZ(20), SR_KHZ(10), SR_MHZ(100), 1, "Use 16 Channels (Max 20MHz)"}, - {DSL_STREAM25x12, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 12, 1, SR_KHZ(10), SR_MHZ(25), + {DSL_STREAM25x12, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 12, 1, SR_KHZ(50), SR_MHZ(25), SR_KHZ(10), SR_MHZ(100), 1, "Use 12 Channels (Max 25MHz)"}, - {DSL_STREAM50x6, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 6, 1, SR_KHZ(10), SR_MHZ(50), + {DSL_STREAM50x6, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 6, 1, SR_KHZ(50), SR_MHZ(50), SR_KHZ(10), SR_MHZ(100), 1, "Use 6 Channels (Max 50MHz)"}, - {DSL_STREAM100x3, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 3, 1, SR_KHZ(10), SR_MHZ(100), + {DSL_STREAM100x3, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 3, 1, SR_KHZ(50), SR_MHZ(100), SR_KHZ(10), SR_MHZ(100), 1, "Use 3 Channels (Max 100MHz)"}, - {DSL_STREAM20x16_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 16, 1, SR_KHZ(10), SR_MHZ(20), + {DSL_STREAM20x16_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 16, 1, SR_KHZ(100), SR_MHZ(20), SR_KHZ(10), SR_MHZ(500), 5, "Use 16 Channels (Max 20MHz)"}, - {DSL_STREAM25x12_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 12, 1, SR_KHZ(10), SR_MHZ(25), + {DSL_STREAM25x12_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 12, 1, SR_KHZ(100), SR_MHZ(25), SR_KHZ(10), SR_MHZ(500), 5, "Use 12 Channels (Max 25MHz)"}, - {DSL_STREAM50x6_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 6, 1, SR_KHZ(10), SR_MHZ(50), + {DSL_STREAM50x6_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 6, 1, SR_KHZ(100), SR_MHZ(50), SR_KHZ(10), SR_MHZ(500), 5, "Use 6 Channels (Max 50MHz)"}, - {DSL_STREAM100x3_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 3, 1, SR_KHZ(10), SR_MHZ(100), + {DSL_STREAM100x3_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 3, 1, SR_KHZ(100), SR_MHZ(100), SR_KHZ(10), SR_MHZ(500), 5, "Use 3 Channels (Max 100MHz)"}, - {DSL_STREAM10x32_32_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 32, 1, SR_KHZ(10), SR_MHZ(10), + {DSL_STREAM10x32_32_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 32, 1, SR_KHZ(100), SR_MHZ(10), SR_KHZ(10), SR_MHZ(500), 5, "Use 32 Channels (Max 10MHz)"}, - {DSL_STREAM20x16_32_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 16, 1, SR_KHZ(10), SR_MHZ(20), + {DSL_STREAM20x16_32_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 16, 1, SR_KHZ(100), SR_MHZ(20), SR_KHZ(10), SR_MHZ(500), 5, "Use 16 Channels (Max 20MHz)"}, - {DSL_STREAM25x12_32_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 12, 1, SR_KHZ(10), SR_MHZ(25), + {DSL_STREAM25x12_32_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 12, 1, SR_KHZ(100), SR_MHZ(25), SR_KHZ(10), SR_MHZ(500), 5, "Use 12 Channels (Max 25MHz)"}, - {DSL_STREAM50x6_32_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 6, 1, SR_KHZ(10), SR_MHZ(50), + {DSL_STREAM50x6_32_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 6, 1, SR_KHZ(100), SR_MHZ(50), SR_KHZ(10), SR_MHZ(500), 5, "Use 6 Channels (Max 50MHz)"}, - {DSL_STREAM100x3_32_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 3, 1, SR_KHZ(10), SR_MHZ(100), + {DSL_STREAM100x3_32_3DN2, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 3, 1, SR_KHZ(100), SR_MHZ(100), SR_KHZ(10), SR_MHZ(500), 5, "Use 3 Channels (Max 100MHz)"}, - {DSL_STREAM50x32, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 32, 1, SR_KHZ(10), SR_MHZ(50), + {DSL_STREAM50x32, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 32, 1, SR_MHZ(1), SR_MHZ(50), SR_KHZ(10), SR_MHZ(500), 5, "Use 32 Channels (Max 50MHz)"}, - {DSL_STREAM100x30, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 30, 1, SR_KHZ(10), SR_MHZ(100), + {DSL_STREAM100x30, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 30, 1, SR_MHZ(1), SR_MHZ(100), SR_KHZ(10), SR_MHZ(500), 5, "Use 30 Channels (Max 100MHz)"}, - {DSL_STREAM250x12, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 12, 1, SR_KHZ(10), SR_MHZ(250), + {DSL_STREAM250x12, LOGIC, SR_CHANNEL_LOGIC, TRUE, 32, 12, 1, SR_MHZ(1), SR_MHZ(250), SR_KHZ(10), SR_MHZ(500), 5, "Use 12 Channels (Max 250MHz)"}, - {DSL_STREAM125x16_16, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 16, 1, SR_KHZ(10), SR_MHZ(125), + {DSL_STREAM125x16_16, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 16, 1, SR_MHZ(1), SR_MHZ(125), SR_KHZ(10), SR_MHZ(500), 5, "Use 16 Channels (Max 125MHz)"}, - {DSL_STREAM250x12_16, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 12, 1, SR_KHZ(10), SR_MHZ(250), + {DSL_STREAM250x12_16, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 12, 1, SR_MHZ(1), SR_MHZ(250), SR_KHZ(10), SR_MHZ(500), 5, "Use 12 Channels (Max 250MHz)"}, - {DSL_STREAM500x6, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 6, 1, SR_KHZ(10), SR_MHZ(500), + {DSL_STREAM500x6, LOGIC, SR_CHANNEL_LOGIC, TRUE, 16, 6, 1, SR_MHZ(1), SR_MHZ(500), SR_KHZ(10), SR_MHZ(500), 5, "Use 6 Channels (Max 500MHz)"}, - {DSL_STREAM1000x3, LOGIC, SR_CHANNEL_LOGIC, TRUE, 8, 3, 1, SR_KHZ(10), SR_GHZ(1), + {DSL_STREAM1000x3, LOGIC, SR_CHANNEL_LOGIC, TRUE, 8, 3, 1, SR_MHZ(1), SR_GHZ(1), SR_KHZ(10), SR_MHZ(500), 5, "Use 3 Channels (Max 1GHz)"}, // LA Buffer - {DSL_BUFFER100x16, LOGIC, SR_CHANNEL_LOGIC, FALSE, 16, 16, 1, SR_KHZ(10), SR_MHZ(100), + {DSL_BUFFER100x16, LOGIC, SR_CHANNEL_LOGIC, FALSE, 16, 16, 1, SR_KHZ(50), SR_MHZ(100), SR_KHZ(10), SR_MHZ(100), 1, "Use Channels 0~15 (Max 100MHz)"}, - {DSL_BUFFER200x8, LOGIC, SR_CHANNEL_LOGIC, FALSE, 8, 8, 1, SR_KHZ(10), SR_MHZ(200), + {DSL_BUFFER200x8, LOGIC, SR_CHANNEL_LOGIC, FALSE, 8, 8, 1, SR_KHZ(50), SR_MHZ(200), SR_KHZ(10), SR_MHZ(100), 1, "Use Channels 0~7 (Max 200MHz)"}, - {DSL_BUFFER400x4, LOGIC, SR_CHANNEL_LOGIC, FALSE, 4, 4, 1, SR_KHZ(10), SR_MHZ(400), + {DSL_BUFFER400x4, LOGIC, SR_CHANNEL_LOGIC, FALSE, 4, 4, 1, SR_KHZ(50), SR_MHZ(400), SR_KHZ(10), SR_MHZ(100), 1, "Use Channels 0~3 (Max 400MHz)"}, - {DSL_BUFFER250x32, LOGIC, SR_CHANNEL_LOGIC, FALSE, 32, 32, 1, SR_KHZ(10), SR_MHZ(250), + {DSL_BUFFER250x32, LOGIC, SR_CHANNEL_LOGIC, FALSE, 32, 32, 1, SR_MHZ(1), SR_MHZ(250), SR_KHZ(10), SR_MHZ(500), 5, "Use Channels 0~31 (Max 250MHz)"}, - {DSL_BUFFER500x16, LOGIC, SR_CHANNEL_LOGIC, FALSE, 16, 16, 1, SR_KHZ(10), SR_MHZ(500), + {DSL_BUFFER500x16, LOGIC, SR_CHANNEL_LOGIC, FALSE, 16, 16, 1, SR_MHZ(1), SR_MHZ(500), SR_KHZ(10), SR_MHZ(500), 5, "Use Channels 0~15 (Max 500MHz)"}, - {DSL_BUFFER1000x8, LOGIC, SR_CHANNEL_LOGIC, FALSE, 8, 8, 1, SR_KHZ(10), SR_GHZ(1), + {DSL_BUFFER1000x8, LOGIC, SR_CHANNEL_LOGIC, FALSE, 8, 8, 1, SR_MHZ(1), SR_GHZ(1), SR_KHZ(10), SR_MHZ(500), 5, "Use Channels 0~7 (Max 1GHz)"}, // DAQ diff --git a/libsigrok4DSL/hardware/demo/demo.c b/libsigrok4DSL/hardware/demo/demo.c index 3f4f75fe..12004170 100644 --- a/libsigrok4DSL/hardware/demo/demo.c +++ b/libsigrok4DSL/hardware/demo/demo.c @@ -75,13 +75,13 @@ static char* demo_mode_names[3] = {"logic", "dso", "analog"}; static struct DEMO_channels logic_channel_modes[] = { {DEMO_LOGIC125x16, LOGIC, SR_CHANNEL_LOGIC, 16, 1, SR_MHZ(1), SR_Mn(1), - SR_KHZ(10), SR_MHZ(125), "Use 16 Channels (Max 125MHz)"}, + SR_KHZ(50), SR_MHZ(125), "Use 16 Channels (Max 125MHz)"}, {DEMO_LOGIC250x12, LOGIC, SR_CHANNEL_LOGIC, 12, 1, SR_MHZ(1), SR_Mn(1), - SR_KHZ(10), SR_MHZ(250), "Use 12 Channels (Max 250MHz)"}, + SR_KHZ(50), SR_MHZ(250), "Use 12 Channels (Max 250MHz)"}, {DEMO_LOGIC500x6, LOGIC, SR_CHANNEL_LOGIC, 6, 1, SR_MHZ(1), SR_Mn(1), - SR_KHZ(10), SR_MHZ(500), "Use 6 Channels (Max 500MHz)"}, + SR_KHZ(50), SR_MHZ(500), "Use 6 Channels (Max 500MHz)"}, {DEMO_LOGIC1000x3, LOGIC, SR_CHANNEL_LOGIC, 3, 1, SR_MHZ(1), SR_Mn(1), - SR_KHZ(10), SR_GHZ(1), "Use 3 Channels (Max 1GHz)"}, + SR_KHZ(50), SR_GHZ(1), "Use 3 Channels (Max 1GHz)"}, }; static struct sr_list_item logic_channel_mode_list[ARRAY_SIZE(logic_channel_modes)+1]; @@ -89,7 +89,7 @@ static struct sr_list_item logic_channel_mode_list[ARRAY_SIZE(logic_channel_mode static struct DEMO_channels channel_modes[] = { // LA Stream {DEMO_LOGIC100x16, LOGIC, SR_CHANNEL_LOGIC, 16, 1, SR_MHZ(1), SR_Mn(1), - SR_KHZ(10), SR_GHZ(1), "Use 16 Channels (Max 20MHz)"}, + SR_KHZ(50), SR_GHZ(1), "Use 16 Channels (Max 20MHz)"}, // DAQ {DEMO_ANALOG10x2, ANALOG, SR_CHANNEL_ANALOG, 2, 8, SR_MHZ(1), SR_Mn(1),