github.com/mist-devel.mist-board
1
0
Fork 0
mirror of https://github.com/mist-devel/mist-board.git synced 2026-05-02 14:40:54 +00:00
Code Issues Releases Wiki Activity

Disabled joystick UP+DOWN OSD trigger

Browse Source
This commit is contained in:
harbaum
2014-03-31 08:07:47 +00:00
parent 7f5703dc64
commit 16e51a873f
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cores/minimig/fpga/altera/minimig_mist.qsf
View File

@@ -625,5 +625,5 @@ set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_INVERSION_MASK_LE
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_NODE_CRC_LOWORD=15587" -section_id auto_signaltap_0
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_NODE_CRC_HIWORD=44938" -section_id auto_signaltap_0
set_global_assignment -name SLD_NODE_PARAMETER_ASSIGNMENT "SLD_RAM_BLOCK_TYPE=M9K" -section_id auto_signaltap_0
set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
set_global_assignment -name SLD_FILE db/stp1_auto_stripped.stp
set_global_assignment -name SLD_FILE db/stp1_auto_stripped.stp
set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top

12
cores/minimig/rtl/minimig/Userio.v
View File

@@ -198,7 +198,9 @@ assign _sjoy2[5:0] = joy2enable ? {_xjoy2[5], sel_autofire ^ _xjoy2[4], _xjoy2[3
always @(joy2enable or _xjoy2 or osd_ctrl)
if (~joy2enable)
if (~_xjoy2[5] || (~_xjoy2[3] && ~_xjoy2[2]))
// TH 3/31/14: Disabled special OSD control
// if (~_xjoy2[5] || (~_xjoy2[3] && ~_xjoy2[2]))
if (~_xjoy2[5])
t_osd_ctrl = KEY_MENU;
else if (~_xjoy2[4])
t_osd_ctrl = KEY_ENTER;
@@ -210,10 +212,10 @@ always @(joy2enable or _xjoy2 or osd_ctrl)
t_osd_ctrl = KEY_LEFT;
else if (~_xjoy2[0])
t_osd_ctrl = KEY_RIGHT;
else if (~_xjoy2[1] && ~_xjoy2[3])
t_osd_ctrl = KEY_PGUP;
else if (~_xjoy2[0] && ~_xjoy2[2])
t_osd_ctrl = KEY_PGDOWN;
// else if (~_xjoy2[1] && ~_xjoy2[3])
// t_osd_ctrl = KEY_PGUP;
// else if (~_xjoy2[0] && ~_xjoy2[2])
// t_osd_ctrl = KEY_PGDOWN;
else
t_osd_ctrl = osd_ctrl;
else