diff --git a/example/example.mk b/example/example.mk index da693a3..55f2cdd 100644 --- a/example/example.mk +++ b/example/example.mk @@ -107,3 +107,13 @@ MAPLE_WINK_OBJ = \ example/maple_wink.elf: LDSCRIPT = $(LIB)/alt.lds example/maple_wink.elf: $(START_OBJ) $(MAPLE_WINK_OBJ) + +MAPLE_VIBRATOR_OBJ = \ + example/maple_vibrator.o \ + vga.o \ + rgb.o \ + serial.o \ + maple/maple.o + +example/maple_vibrator.elf: LDSCRIPT = $(LIB)/alt.lds +example/maple_vibrator.elf: $(START_OBJ) $(MAPLE_VIBRATOR_OBJ) diff --git a/example/maple_controller.cpp b/example/maple_controller.cpp index 8e831d3..33fe8bf 100644 --- a/example/maple_controller.cpp +++ b/example/maple_controller.cpp @@ -15,12 +15,6 @@ uint32_t _receive_buf[1024 / 4 + 32] = {0}; static uint32_t * command_buf; static uint32_t * receive_buf; -struct port_state { - bool controller_connected; -}; - -static port_state state[4] = {0}; - void do_get_condition(uint32_t port) { uint32_t destination_port; @@ -56,15 +50,14 @@ void do_get_condition(uint32_t port) using response_type = struct maple::command_response>; auto response = reinterpret_cast(receive_buf); auto& bus_data = response->bus_data; - auto& data_fields = response->bus_data.data_fields; if (bus_data.command_code != data_transfer::command_code) { return; } + auto& data_fields = bus_data.data_fields; if ((data_fields.function_type & std::byteswap(function_type::controller)) == 0) { return; } - state[port].controller_connected = 1; bool a = ft0::data_transfer::digital_button::a(data_fields.data.digital_button); if (a == 0) { serial::string("port "); @@ -92,7 +85,6 @@ void do_device_request() auto& data_fields = response->bus_data.data_fields; if (bus_data.command_code != device_status::command_code) { // the controller is disconnected - state[port].controller_connected = 0; } else { if ((data_fields.device_id.ft & std::byteswap(function_type::controller)) != 0) { //serial::string("is controller: "); @@ -108,6 +100,8 @@ void main() command_buf = align_32byte(_command_buf); receive_buf = align_32byte(_receive_buf); + // flycast needs this in HLE mode, or else it won't start the vcount + // counter. vga(); while (1) { diff --git a/example/maple_vibrator.cpp b/example/maple_vibrator.cpp new file mode 100644 index 0000000..b4d5d8b --- /dev/null +++ b/example/maple_vibrator.cpp @@ -0,0 +1,192 @@ +#include + +#include "vga.hpp" +#include "align.hpp" + +#include "maple/maple.hpp" +#include "maple/maple_bus_bits.hpp" +#include "maple/maple_bus_commands.hpp" +#include "maple/maple_bus_ft8.hpp" +#include "serial.hpp" + +uint32_t _command_buf[1024 / 4 + 32] = {0}; +uint32_t _receive_buf[1024 / 4 + 32] = {0}; + +static uint32_t * command_buf; +static uint32_t * receive_buf; + +void do_lm_request(uint8_t port, uint8_t lm) +{ + uint32_t destination_port; + uint32_t destination_ap; + + switch (port) { + case 0: + destination_port = host_instruction::port_select::a; + destination_ap = ap::de::expansion_device | ap::port_select::a | lm; + break; + case 1: + destination_port = host_instruction::port_select::b; + destination_ap = ap::de::expansion_device | ap::port_select::b | lm; + break; + case 2: + destination_port = host_instruction::port_select::c; + destination_ap = ap::de::expansion_device | ap::port_select::c | lm; + break; + case 3: + destination_port = host_instruction::port_select::d; + destination_ap = ap::de::expansion_device | ap::port_select::d | lm; + break; + default: + return; + } + + /* + get media info + */ + + maple::init_host_command(command_buf, receive_buf, + destination_port, + destination_ap, get_media_info::command_code, (sizeof (struct get_media_info::data_fields)), + true); + + using command_type = struct maple::host_command; + auto host_command = reinterpret_cast(command_buf); + auto& fields = host_command->bus_data.data_fields; + fields.function_type = std::byteswap(function_type::vibration); + fields.pt = std::byteswap(1 << 24); + + maple::dma_start(command_buf); + + using response_type = struct maple::command_response>; + auto response = reinterpret_cast(receive_buf); + auto& bus_data = response->bus_data; + if (bus_data.command_code != data_transfer::command_code) { + serial::string("lm did not reply to vibration get_media_info: "); + serial::integer(lm); + return; + } + serial::string("lm replied to vibration get_media_info: "); + serial::integer(lm); + + auto& data_fields = bus_data.data_fields; + + { + using namespace ft8::data_transfer::vset; + serial::string("vn: "); + serial::integer(vn(data_fields.data.vset)); + serial::string("vp: "); + serial::integer(vp(data_fields.data.vset)); + serial::string("vd: "); + serial::integer(vd(data_fields.data.vset)); + serial::string("pf: "); + serial::integer(pf(data_fields.data.vset)); + serial::string("cv: "); + serial::integer(cv(data_fields.data.vset)); + serial::string("pd: "); + serial::integer(pd(data_fields.data.vset)); + serial::string("owf: "); + serial::integer(owf(data_fields.data.vset)); + serial::string("va: "); + serial::integer(va(data_fields.data.vset)); + serial::string("\nfm0 (fmin): "); + serial::integer(data_fields.data.fm0); + serial::string("fm1 (fmax): "); + serial::integer(data_fields.data.fm1); + } + + /* + set condition + */ + { + using data_field_type = set_condition::data_fields; + + maple::init_host_command(command_buf, receive_buf, + destination_port, + destination_ap, set_condition::command_code, (sizeof (data_field_type)), + true); + + using command_type = struct maple::host_command; + auto host_command = reinterpret_cast(command_buf); + auto& fields = host_command->bus_data.data_fields; + fields.function_type = std::byteswap(function_type::vibration); + fields.write_in_data.ctrl = 0x11; + fields.write_in_data.pow = 0x70; + fields.write_in_data.freq = 0x27; + fields.write_in_data.inc = 0x00; + + maple::dma_start(command_buf); + + using response_type = struct maple::command_response; + auto response = reinterpret_cast(receive_buf); + auto& bus_data = response->bus_data; + + if (bus_data.command_code != device_reply::command_code) { + serial::string("lm did not reply to vibration set_condition: "); + serial::integer(lm); + } else { + serial::string("lm replied to vibration set_condition: "); + serial::integer(lm); + } + + } +} + +void do_lm_requests(uint8_t port, uint8_t lm) +{ + if (lm & ap::lm_bus::_0) + do_lm_request(port, lm & ap::lm_bus::_0); + if (lm & ap::lm_bus::_1) + do_lm_request(port, lm & ap::lm_bus::_1); + if (lm & ap::lm_bus::_2) + do_lm_request(port, lm & ap::lm_bus::_2); + if (lm & ap::lm_bus::_3) + do_lm_request(port, lm & ap::lm_bus::_3); + if (lm & ap::lm_bus::_4) + do_lm_request(port, lm & ap::lm_bus::_4); +} + +void do_device_request() +{ + using response_type = struct maple::command_response; + constexpr uint32_t response_size = align_32byte(sizeof (response_type)); + + maple::init_host_command_all_ports(command_buf, receive_buf, + device_request::command_code, + (sizeof (device_request::data_fields)), // command_data_size + (sizeof (device_status::data_fields))); // response_data_size + maple::dma_start(command_buf); + + for (uint8_t port = 0; port < 4; port++) { + auto response = reinterpret_cast(&receive_buf[response_size * port / 4]); + + auto& bus_data = response->bus_data; + auto& data_fields = response->bus_data.data_fields; + if (bus_data.command_code != device_status::command_code) { + // the controller is disconnected + } else { + if ((data_fields.device_id.ft & std::byteswap(function_type::controller)) != 0) { + serial::string("controller: "); + serial::integer(port); + //serial::integer(bus_data.source_ap & ap::lm_bus::bit_mask); + do_lm_requests(port, bus_data.source_ap & ap::lm_bus::bit_mask); + } + } + } +} + +void main() +{ + command_buf = align_32byte(_command_buf); + receive_buf = align_32byte(_receive_buf); + + vga(); + + while (1) { + for (int i = 0; i < 120; i++) { + v_sync_out(); + v_sync_in(); + } + do_device_request(); + }; +} diff --git a/maple/maple_bus_ft8.hpp b/maple/maple_bus_ft8.hpp index 5e7fa50..0be21b9 100644 --- a/maple/maple_bus_ft8.hpp +++ b/maple/maple_bus_ft8.hpp @@ -29,9 +29,21 @@ namespace ft8 { struct data_format { uint16_t vset; - uint16_t fm; + uint8_t fm0; + uint8_t fm1; }; static_assert((sizeof (struct data_format)) == 4); } + + namespace set_condition { + struct data_format { + uint8_t ctrl; + uint8_t pow; + uint8_t freq; + uint8_t inc; + }; + static_assert((sizeof (struct data_format)) == 4); + } + } diff --git a/regs/gen/maple_data_format.py b/regs/gen/maple_data_format.py index 3cae87c..4ca5a52 100644 --- a/regs/gen/maple_data_format.py +++ b/regs/gen/maple_data_format.py @@ -130,6 +130,8 @@ def render_formats(name, formats): yield f"namespace {name} {{" for format in formats: yield from render_format(format) + yield "" + yield "}" if __name__ == "__main__": diff --git a/regs/maple_bus_ft8.csv b/regs/maple_bus_ft8.csv index aa8c13e..402a169 100644 --- a/regs/maple_bus_ft8.csv +++ b/regs/maple_bus_ft8.csv @@ -1,5 +1,11 @@ "data_transfer",7,6,5,4,3,2,1,0 "vset","vn","vn","vn","vn","vp","vp","vd","vd" "vset","pf","cv","pd","owf","va","va","va","va" -"fm",,,,,,,, -"fm",,,,,,,, +"fm0",,,,,,,, +"fm1",,,,,,,, +,,,,,,,, +"set_condition",7,6,5,4,3,2,1,0 +"ctrl",,,,,,,, +"pow",,,,,,,, +"freq",,,,,,,, +"inc",,,,,,,, diff --git a/regs/maple_bus_ft8.ods b/regs/maple_bus_ft8.ods index 7b878e6..79143f0 100644 Binary files a/regs/maple_bus_ft8.ods and b/regs/maple_bus_ft8.ods differ