diff options
| -rw-r--r-- | firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c | 4 | ||||
| -rw-r--r-- | firmware/target/mips/ingenic_x1000/x1000/ost.h | 10 | ||||
| -rw-r--r-- | utils/reggen-ng/x1000.reggen | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c index 4354257f7b..04e3102d42 100644 --- a/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c +++ b/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c @@ -45,11 +45,11 @@ #define STATE_SCROLLING 4 /* Assume there's no active touch if no event is reported in this time */ -#define AUTORELEASE_TIME (10000 * OST_TICKS_PER_US) +#define AUTORELEASE_TIME (40 * 1000 * OST_TICKS_PER_US) /* If there's no significant motion on the scrollbar for this time, * then report it as a button press instead */ -#define SCROLL_PRESS_TIME (100000 * OST_TICKS_PER_US) +#define SCROLL_PRESS_TIME (400 * 1000 * OST_TICKS_PER_US) /* If a press on the scrollbar moves more than this during SCROLL_PRESS_TIME, * then we enter scrolling mode. */ diff --git a/firmware/target/mips/ingenic_x1000/x1000/ost.h b/firmware/target/mips/ingenic_x1000/x1000/ost.h index 8f2619e0e7..9444712e86 100644 --- a/firmware/target/mips/ingenic_x1000/x1000/ost.h +++ b/firmware/target/mips/ingenic_x1000/x1000/ost.h @@ -31,21 +31,21 @@ #define JT_OST_CTRL JIO_32_RW #define JN_OST_CTRL OST_CTRL #define JI_OST_CTRL -#define BP_OST_CTRL_PRESCALE2 3 -#define BM_OST_CTRL_PRESCALE2 0x38 +#define BP_OST_CTRL_PRESCALE2 2 +#define BM_OST_CTRL_PRESCALE2 0xc #define BV_OST_CTRL_PRESCALE2__BY_1 0x0 #define BV_OST_CTRL_PRESCALE2__BY_4 0x1 #define BV_OST_CTRL_PRESCALE2__BY_16 0x2 -#define BF_OST_CTRL_PRESCALE2(v) (((v) & 0x7) << 3) +#define BF_OST_CTRL_PRESCALE2(v) (((v) & 0x3) << 2) #define BFM_OST_CTRL_PRESCALE2(v) BM_OST_CTRL_PRESCALE2 #define BF_OST_CTRL_PRESCALE2_V(e) BF_OST_CTRL_PRESCALE2(BV_OST_CTRL_PRESCALE2__##e) #define BFM_OST_CTRL_PRESCALE2_V(v) BM_OST_CTRL_PRESCALE2 #define BP_OST_CTRL_PRESCALE1 0 -#define BM_OST_CTRL_PRESCALE1 0x7 +#define BM_OST_CTRL_PRESCALE1 0x3 #define BV_OST_CTRL_PRESCALE1__BY_1 0x0 #define BV_OST_CTRL_PRESCALE1__BY_4 0x1 #define BV_OST_CTRL_PRESCALE1__BY_16 0x2 -#define BF_OST_CTRL_PRESCALE1(v) (((v) & 0x7) << 0) +#define BF_OST_CTRL_PRESCALE1(v) (((v) & 0x3) << 0) #define BFM_OST_CTRL_PRESCALE1(v) BM_OST_CTRL_PRESCALE1 #define BF_OST_CTRL_PRESCALE1_V(e) BF_OST_CTRL_PRESCALE1(BV_OST_CTRL_PRESCALE1__##e) #define BFM_OST_CTRL_PRESCALE1_V(v) BM_OST_CTRL_PRESCALE1 diff --git a/utils/reggen-ng/x1000.reggen b/utils/reggen-ng/x1000.reggen index d34a0eb7bc..8c6c49e27d 100644 --- a/utils/reggen-ng/x1000.reggen +++ b/utils/reggen-ng/x1000.reggen @@ -807,8 +807,8 @@ node OST { addr 0xb2000000 reg CTRL 0x00 { - field 5 3 PRESCALE2 { enum BY_1 0; enum BY_4 1; enum BY_16 2; } - field 2 0 PRESCALE1 { enum BY_1 0; enum BY_4 1; enum BY_16 2; } + field 3 2 PRESCALE2 { enum BY_1 0; enum BY_4 1; enum BY_16 2; } + field 1 0 PRESCALE1 { enum BY_1 0; enum BY_4 1; enum BY_16 2; } } reg ENABLE 0x04 { |