Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-06 12:53:46 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clang is being annoying (nw)

Browse Source
This commit is contained in:
Olivier Galibert 2018-04-05 15:27:30 +02:00
parent ebf7032696
commit 2e509a3b48
3 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/machine/gen_fifo.h
View File

@ -58,7 +58,7 @@
* (rasterizer, etc). * (rasterizer, etc).
* *
* - on_pop: * - on_pop:
* Called when a new value was just pushed. That callback is * Called when a new value was just popped. That callback is
* usually not needed, but it can be useful when the source is not * usually not needed, but it can be useful when the source is not
* an executable device but something hardcoded. * an executable device but something hardcoded.
* *
@ -88,8 +88,8 @@ public:
std::function<void ()> on_fifo_unempty, std::function<void ()> on_fifo_unempty,
std::function<void ()> on_fifo_full_post_sync, std::function<void ()> on_fifo_full_post_sync,
std::function<void ()> on_fifo_unfull, std::function<void ()> on_fifo_unfull,
std::function<void ()> on_push = [](){}, std::function<void ()> on_push,
std::function<void ()> on_pop = [](){}) { std::function<void ()> on_pop) {
m_on_fifo_empty_pre_sync = on_fifo_empty_pre_sync; m_on_fifo_empty_pre_sync = on_fifo_empty_pre_sync;
m_on_fifo_empty_post_sync = on_fifo_empty_post_sync; m_on_fifo_empty_post_sync = on_fifo_empty_post_sync;
m_on_fifo_unempty = on_fifo_unempty; m_on_fifo_unempty = on_fifo_unempty;

35
src/mame/drivers/model2.cpp
View File

@ -195,13 +195,18 @@ MACHINE_START_MEMBER(model2_tgp_state,model2_tgp)
[this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }); [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[ ]() { },
[ ]() { });
m_copro_fifo_out->setup(16, m_copro_fifo_out->setup(16,
[this]() { m_maincpu->i960_stall(); }, [this]() { m_maincpu->i960_stall(); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }); [this]() { m_copro_tgp->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[ ]() { },
[ ]() { });
} }
MACHINE_START_MEMBER(model2b_state,model2b) MACHINE_START_MEMBER(model2b_state,model2b)
@ -209,9 +214,9 @@ MACHINE_START_MEMBER(model2b_state,model2b)
MACHINE_START_CALL_MEMBER(model2); MACHINE_START_CALL_MEMBER(model2);
m_copro_fifo_in->setup(16, m_copro_fifo_in->setup(16,
[]() { }, [ ]() { },
[]() { }, [ ]() { },
[]() { }, [ ]() { },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[this]() { m_copro_adsp->set_flag_input(0, m_copro_fifo_in->is_empty()); }, [this]() { m_copro_adsp->set_flag_input(0, m_copro_fifo_in->is_empty()); },
@ -220,8 +225,8 @@ MACHINE_START_MEMBER(model2b_state,model2b)
[this]() { m_maincpu->i960_stall(); }, [this]() { m_maincpu->i960_stall(); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[]() { }, [ ]() { },
[]() { }, [ ]() { },
[this]() { m_copro_adsp->set_flag_input(1, m_copro_fifo_in->is_full()); }, [this]() { m_copro_adsp->set_flag_input(1, m_copro_fifo_in->is_full()); },
[this]() { m_copro_adsp->set_flag_input(1, m_copro_fifo_in->is_full()); }); [this]() { m_copro_adsp->set_flag_input(1, m_copro_fifo_in->is_full()); });
} }
@ -231,17 +236,21 @@ MACHINE_START_MEMBER(model2c_state,model2c)
MACHINE_START_CALL_MEMBER(model2); MACHINE_START_CALL_MEMBER(model2);
m_copro_fifo_in->setup(16, m_copro_fifo_in->setup(16,
[]() { }, [ ]() { },
[]() { }, [ ]() { },
[]() { }, [ ]() { },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }); [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[ ]() { },
[ ]() { });
m_copro_fifo_out->setup(16, m_copro_fifo_out->setup(16,
[this]() { m_maincpu->i960_stall(); }, [this]() { m_maincpu->i960_stall(); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[]() { }, [ ]() { },
[]() { }); [ ]() { },
[ ]() { },
[ ]() { });
} }
MACHINE_START_MEMBER(model2_tgp_state,srallyc) MACHINE_START_MEMBER(model2_tgp_state,srallyc)

23
src/mame/machine/model1.cpp
View File

@ -1749,13 +1749,17 @@ MACHINE_START_MEMBER(model1_state,model1)
[this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }); [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[ ]() { },
[ ]() { });
m_copro_fifo_out->setup(16, m_copro_fifo_out->setup(16,
[this]() { m_maincpu->stall(); }, [this]() { m_maincpu->stall(); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }); [this]() { m_tgp_copro->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[ ]() { },
[ ]() { });
} else { } else {
bool is_swa = bool is_swa =
@ -1773,18 +1777,21 @@ MACHINE_START_MEMBER(model1_state,model1)
push_cb = [this]() { copro_hle_vf(); }; push_cb = [this]() { copro_hle_vf(); };
m_copro_fifo_in->setup(16, m_copro_fifo_in->setup(16,
[](){}, [ ]() { },
[](){}, [ ]() { },
[](){}, [ ]() { },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
push_cb); push_cb,
[ ]() { });
m_copro_fifo_out->setup(16, m_copro_fifo_out->setup(16,
[this]() { m_maincpu->stall(); }, [this]() { m_maincpu->stall(); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); },
[this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); }, [this]() { m_maincpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); },
[](){}, [ ]() { },
[](){}); [ ]() { },
[ ]() { },
[ ]() { });
} }
} }