mirror of
https://salsa.debian.org/gnuk-team/gnuk/gnuk.git
synced 2024-09-20 02:40:08 +00:00
Remove pin-dial
This commit is contained in:
NIIBE Yutaka
parent
840e9e372a
commit
17e9d53b72
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
2013-11-26 Niibe Yutaka <gniibe@fsij.org>
|
||||
|
||||
* src/pin-dial.c: Remove.
|
||||
* src/configure: Remove pin-dial suppot.
|
||||
|
||||
2013-11-25 Niibe Yutaka <gniibe@fsij.org>
|
||||
|
||||
* src/Makefile.in (HEXOUTPUT_MAKE_OPTION): New.
|
||||
* src/configure (HEXOUTPUT_MAKE_OPTION): New.
|
||||
* src/main.c: Include board.h.
|
||||
* src/stm32f103.h (EXTI0_IRQ, EXTI1_IRQ): New.
|
||||
|
||||
2013-11-18 Niibe Yutaka <gniibe@fsij.org>
|
||||
|
||||
* regnual/sys.c (entry): Bug fix of clearing BSS.
|
||||
|
||||
8
NEWS
8
NEWS
@ -1,5 +1,13 @@
|
||||
Gnuk NEWS - User visible changes
|
||||
|
||||
* Major changes in Gnuk 1.1.0
|
||||
|
||||
Released 2013-12-XX, by NIIBE Yutaka
|
||||
|
||||
** Removal of obsolete features
|
||||
pin-dial
|
||||
|
||||
|
||||
* Major changes in Gnuk 1.0.4
|
||||
|
||||
Released 2013-03-15, by NIIBE Yutaka
|
||||
|
||||
2
chopstx
2
chopstx
@ -1 +1 @@
|
||||
Subproject commit 51a862e200766d563583b5e5085815fae4db770f
|
||||
Subproject commit 5968e2a0539280c9f61e75bbf8bc78711c0d8496
|
||||
2
src/configure
vendored
2
src/configure
vendored
@ -95,7 +95,7 @@ Configuration:
|
||||
FST_01
|
||||
FST_01_00
|
||||
--enable-debug debug with virtual COM port [no]
|
||||
--enable-pinpad={cir,dial}
|
||||
--enable-pinpad=cir
|
||||
PIN entry support [no]
|
||||
--enable-certdo support CERT.3 data object [no]
|
||||
--enable-keygen support key generation [no]
|
||||
|
||||
220
src/pin-dial.c
220
src/pin-dial.c
@ -1,220 +0,0 @@
|
||||
/*
|
||||
* pin-dial.c -- PIN input device support (rotary encoder + push switch)
|
||||
*
|
||||
* Copyright (C) 2011 Free Software Initiative of Japan
|
||||
* Author: NIIBE Yutaka <gniibe@fsij.org>
|
||||
*
|
||||
* This file is a part of Gnuk, a GnuPG USB Token implementation.
|
||||
*
|
||||
* Gnuk is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Gnuk is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
* License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include "board.h"
|
||||
#include "gnuk.h"
|
||||
|
||||
uint8_t pin_input_buffer[MAX_PIN_CHARS];
|
||||
uint8_t pin_input_len;
|
||||
|
||||
#define LED_DISP_BLINK_INTERVAL0 MS2ST(150)
|
||||
#define LED_DISP_BLINK_INTERVAL1 MS2ST(100)
|
||||
|
||||
/*
|
||||
* PB6 TIM4_CH1
|
||||
* PB7 TIM4_CH2
|
||||
*
|
||||
* TIM4_SMCR
|
||||
* SMS = 001
|
||||
* TIM4_CCER
|
||||
* CC1P = 0
|
||||
* CC2P = 0
|
||||
* TIM4_CCMR1
|
||||
* CC1S= 01
|
||||
* CC2S= 01
|
||||
* TIM4_CR1
|
||||
* CEN= 1
|
||||
*/
|
||||
|
||||
#define OFF '\x00'
|
||||
#define ENTER '\x0a'
|
||||
static struct led_pattern { uint8_t c, v; } led_pattern[] =
|
||||
{
|
||||
/* char : dp a b c d e f g */
|
||||
{ ENTER, 0xf8 }, /* |- : 1 1 1 1 1 0 0 0 (enter) */
|
||||
{ ' ', 0xff }, /* SPC : 1 1 1 1 1 1 1 1 */
|
||||
{ '0', 0x81 }, /* 0 : 1 0 0 0 0 0 0 1 */
|
||||
{ '1', 0xcf }, /* 1 : 1 1 0 0 1 1 1 1 */
|
||||
{ '2', 0x92 }, /* 2 : 1 0 0 1 0 0 1 0 */
|
||||
{ '3', 0x86 }, /* 3 : 1 0 0 0 0 1 1 0 */
|
||||
{ '4', 0xcc }, /* 4 : 1 1 0 0 1 1 0 0 */
|
||||
{ '5', 0xa4 }, /* 5 : 1 0 1 0 0 1 0 0 */
|
||||
{ '6', 0xa0 }, /* 6 : 1 0 1 0 0 0 0 0 */
|
||||
{ '7', 0x8d }, /* 7 : 1 0 0 0 1 1 0 1 */
|
||||
{ '8', 0x80 }, /* 8 : 1 0 0 0 0 0 0 0 */
|
||||
{ '9', 0x84 }, /* 9 : 1 0 0 0 0 1 0 0 */
|
||||
{ 'A', 0x88 }, /* A : 1 0 0 0 1 0 0 0 */
|
||||
{ 'B', 0xe0 }, /* b : 1 1 1 0 0 0 0 0 */
|
||||
{ 'C', 0xb1 }, /* C : 1 0 1 1 0 0 0 1 */
|
||||
{ 'D', 0xc2 }, /* d : 1 1 0 0 0 0 1 0 */
|
||||
{ 'E', 0xb0 }, /* E : 1 0 1 1 0 0 0 0 */
|
||||
{ 'F', 0xb8 }, /* F : 1 0 1 1 1 0 0 0 */
|
||||
|
||||
{ 'G', 0xa1 }, /* G : 1 0 1 0 0 0 0 1 */
|
||||
{ '\xff', 0xce }, /* -| : 1 1 0 0 1 1 1 0 (backspace) */
|
||||
};
|
||||
|
||||
#define LENGTH_LED_PATTERN (int)(sizeof led_pattern / sizeof (struct led_pattern))
|
||||
|
||||
static void
|
||||
led_disp (uint8_t c)
|
||||
{
|
||||
uint16_t v = palReadPort (IOPORT2) | 0x00ff;
|
||||
|
||||
if (c == OFF)
|
||||
v |= 0xff00;
|
||||
else
|
||||
{
|
||||
int i;
|
||||
|
||||
v &= 0x80ff;
|
||||
for (i = 0; i < LENGTH_LED_PATTERN; i++)
|
||||
if (led_pattern[i].c == c)
|
||||
{
|
||||
v |= ((led_pattern[i].v & 0x7f) << 8); /* Don't touch DP. */
|
||||
break;
|
||||
}
|
||||
else if (led_pattern[i].c > c)
|
||||
{
|
||||
v |= 0x7f00; /* default: SPC */
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
palWritePort (IOPORT2, v);
|
||||
}
|
||||
|
||||
static void
|
||||
blink_dp (void)
|
||||
{
|
||||
uint16_t v = palReadPort (IOPORT2) | 0x00ff;
|
||||
|
||||
v ^= 0x8000;
|
||||
palWritePort (IOPORT2, v);
|
||||
}
|
||||
|
||||
static Thread *pin_thread;
|
||||
|
||||
void
|
||||
dial_sw_interrupt (void)
|
||||
{
|
||||
dial_sw_disable ();
|
||||
chEvtSignalI (pin_thread, EV_PINPAD_INPUT_DONE);
|
||||
palClearPad (IOPORT1, GPIOA_LED2);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
pinpad_getline (int msg_code, uint32_t timeout)
|
||||
{
|
||||
uint16_t count, count_prev;
|
||||
uint8_t input_mode;
|
||||
uint8_t sw_push_count;
|
||||
uint8_t sw_event;
|
||||
|
||||
(void)msg_code;
|
||||
|
||||
pin_thread = chThdSelf ();
|
||||
led_disp (' ');
|
||||
|
||||
TIM4->CNT = 0;
|
||||
TIM4->CR1 |= TIM_CR1_CEN;
|
||||
input_mode = 0;
|
||||
count = count_prev = 0;
|
||||
pin_input_len = 0;
|
||||
sw_push_count = 0;
|
||||
sw_event = 0;
|
||||
|
||||
while (1)
|
||||
{
|
||||
eventmask_t m;
|
||||
|
||||
blink_dp ();
|
||||
dial_sw_enable ();
|
||||
m = chEvtWaitOneTimeout (ALL_EVENTS, LED_DISP_BLINK_INTERVAL0);
|
||||
|
||||
if (m == EV_PINPAD_INPUT_DONE || sw_push_count)
|
||||
{
|
||||
if (palReadPad (IOPORT2, GPIOB_BUTTON) == 0)
|
||||
sw_push_count++;
|
||||
else /* ignore this bounce */
|
||||
{
|
||||
palSetPad (IOPORT1, GPIOA_LED2);
|
||||
sw_push_count = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (sw_push_count >= 2)
|
||||
sw_event = 1;
|
||||
|
||||
count = (TIM4->CNT) / 2;
|
||||
|
||||
if (input_mode == 1)
|
||||
{
|
||||
if (count_prev != count)
|
||||
input_mode = 0;
|
||||
else
|
||||
{
|
||||
led_disp (ENTER);
|
||||
if (sw_event)
|
||||
{
|
||||
palSetPad (IOPORT1, GPIOA_LED2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (input_mode == 0)
|
||||
{
|
||||
uint8_t c;
|
||||
|
||||
if (count < 10)
|
||||
c = count + '0';
|
||||
else
|
||||
c = (count - 10) + 'A';
|
||||
|
||||
led_disp (c);
|
||||
|
||||
if (sw_event)
|
||||
{
|
||||
pin_input_buffer[pin_input_len] = c;
|
||||
if (pin_input_len < MAX_PIN_CHARS - 1)
|
||||
pin_input_len++;
|
||||
input_mode = 1;
|
||||
sw_event = sw_push_count = 0;
|
||||
palSetPad (IOPORT1, GPIOA_LED2);
|
||||
}
|
||||
}
|
||||
|
||||
chThdSleep (LED_DISP_BLINK_INTERVAL1);
|
||||
count_prev = count;
|
||||
}
|
||||
|
||||
led_disp (OFF);
|
||||
TIM4->CR1 &= ~TIM_CR1_CEN;
|
||||
dial_sw_disable ();
|
||||
return pin_input_len;
|
||||
}
|
||||
@ -27,12 +27,14 @@ static struct RCC *const RCC = ((struct RCC *const)RCC_BASE);
|
||||
#define RCC_APB2ENR_TIM1EN 0x00000800
|
||||
#define RCC_APB1ENR_TIM2EN 0x00000001
|
||||
#define RCC_APB1ENR_TIM3EN 0x00000002
|
||||
#define RCC_APB1ENR_TIM4EN 0x00000004
|
||||
|
||||
#define RCC_APB2RSTR_ADC1RST 0x00000200
|
||||
#define RCC_APB2RSTR_ADC2RST 0x00000400
|
||||
#define RCC_APB2RSTR_TIM1RST 0x00000800
|
||||
#define RCC_APB1RSTR_TIM2RST 0x00000001
|
||||
#define RCC_APB1RSTR_TIM3RST 0x00000002
|
||||
#define RCC_APB1RSTR_TIM4RST 0x00000004
|
||||
|
||||
#define CRC_CR_RESET 0x00000001
|
||||
|
||||
@ -237,8 +239,10 @@ struct TIM
|
||||
|
||||
#define TIM2_BASE 0x40000000
|
||||
#define TIM3_BASE 0x40000400
|
||||
#define TIM4_BASE 0x40000800
|
||||
static struct TIM *const TIM2 = (struct TIM *const)TIM2_BASE;
|
||||
static struct TIM *const TIM3 = (struct TIM *const)TIM3_BASE;
|
||||
static struct TIM *const TIM4 = (struct TIM *const)TIM4_BASE;
|
||||
|
||||
#define TIM_CR1_CEN 0x0001
|
||||
#define TIM_CR1_UDIS 0x0002
|
||||
@ -638,6 +642,7 @@ static struct EXTI *const EXTI = (struct EXTI *const)EXTI_BASE;
|
||||
#define EXTI9_5_IRQ 23
|
||||
#define TIM2_IRQ 28
|
||||
#define TIM3_IRQ 29
|
||||
#define TIM4_IRQ 30
|
||||
|
||||
struct AFIO
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user