Re: [PATCH 4/6] i386: reformat the key map

[Samuel Thibault]

Justus Winter, le Mon 09 Jun 2014 18:38:33 +0200, a écrit :
> * i386/i386at/kd.c (key_map): Remove superfluous newlines so that
> every entry fits into one line.  This way line numbers can be used as
> an index into the map.

Ack.

> ---
>  i386/i386at/kd.c | 27 +++++++++------------------
>  1 file changed, 9 insertions(+), 18 deletions(-)
> 
> diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
> index 9f9faf4..5371fb2 100644
> --- a/i386/i386at/kd.c
> +++ b/i386/i386at/kd.c
> @@ -240,8 +240,7 @@ unsigned char     key_map[NUMKEYS][WIDTH_KMAP] = {
>  {K_LBRKT,NC,NC, K_LBRACE,NC,NC, K_ESC,NC,NC,   0x1b,K_LBRKT,NC,  
> 0x1b,0x4e,K_LBRACE},
>  {K_RBRKT,NC,NC, K_RBRACE,NC,NC, K_GS,NC,NC,    0x1b,K_RBRKT,NC,  
> 0x1b,0x4e,K_RBRACE},
>  {K_CR,NC,NC,    K_CR,NC,NC,     K_CR,NC,NC,    0x1b,K_CR,NC,  K_CR,NC,NC},
> -{K_SCAN,K_CTLSC,NC, K_SCAN,K_CTLSC,NC, K_SCAN,K_CTLSC,NC, K_SCAN,K_CTLSC,NC,
> -     K_SCAN,K_CTLSC,NC},
> +{K_SCAN,K_CTLSC,NC, K_SCAN,K_CTLSC,NC, K_SCAN,K_CTLSC,NC, K_SCAN,K_CTLSC,NC, 
> K_SCAN,K_CTLSC,NC},
>  {K_a,NC,NC,     K_A,NC,NC,      K_SOH,NC,NC,   0x1b,K_a,NC,  0x1b,0x4e,K_A},
>  {K_s,NC,NC,     K_S,NC,NC,      K_DC3,NC,NC,   0x1b,K_s,NC,  0x1b,0x4e,K_S},
>  {K_d,NC,NC,     K_D,NC,NC,      K_EOT,NC,NC,   0x1b,K_d,NC,  0x1b,0x4e,K_D},
> @@ -254,8 +253,7 @@ unsigned char     key_map[NUMKEYS][WIDTH_KMAP] = {
>  {K_SEMI,NC,NC,  K_COLON,NC,NC,  K_SEMI,NC,NC,  0x1b,K_SEMI,NC,  
> 0x1b,0x4e,K_COLON},
>  {K_SQUOTE,NC,NC,K_DQUOTE,NC,NC, K_SQUOTE,NC,NC,0x1b,K_SQUOTE,NC,  
> 0x1b,0x4e,K_DQUOTE},
>  {K_GRAV,NC,NC,  K_TILDE,NC,NC,  K_RS,NC,NC,    0x1b,K_GRAV,NC,  
> 0x1b,0x4e,K_TILDE},
> -{K_SCAN,K_LSHSC,NC, K_SCAN,K_LSHSC,NC, K_SCAN,K_LSHSC,NC, K_SCAN,K_LSHSC,NC,
> - K_SCAN,K_LSHSC,NC},
> +{K_SCAN,K_LSHSC,NC, K_SCAN,K_LSHSC,NC, K_SCAN,K_LSHSC,NC, K_SCAN,K_LSHSC,NC, 
> K_SCAN,K_LSHSC,NC},
>  {K_BSLSH,NC,NC, K_PIPE,NC,NC,   K_FS,NC,NC,    0x1b,K_BSLSH,NC,  
> 0x1b,0x4e,K_PIPE},
>  {K_z,NC,NC,     K_Z,NC,NC,      K_SUB,NC,NC,   0x1b,K_z,NC,  0x1b,0x4e,K_Z},
>  {K_x,NC,NC,     K_X,NC,NC,      K_CAN,NC,NC,   0x1b,K_x,NC,  0x1b,0x4e,K_X},
> @@ -267,14 +265,11 @@ unsigned char   key_map[NUMKEYS][WIDTH_KMAP] = {
>  {K_COMMA,NC,NC, K_LTHN,NC,NC,   K_COMMA,NC,NC, 0x1b,K_COMMA,NC,  
> 0x1b,0x4e,K_LTHN},
>  {K_PERIOD,NC,NC,K_GTHN,NC,NC,   K_PERIOD,NC,NC,0x1b,K_PERIOD,NC,  
> 0x1b,0x4e,K_GTHN},
>  {K_SLASH,NC,NC, K_QUES,NC,NC,   K_SLASH,NC,NC, 0x1b,K_SLASH,NC,  
> 0x1b,0x4e,K_QUES},
> -{K_SCAN,K_RSHSC,NC, K_SCAN,K_RSHSC,NC, K_SCAN,K_RSHSC,NC, K_SCAN,K_RSHSC,NC,
> -     K_SCAN,K_RSHSC,NC},
> +{K_SCAN,K_RSHSC,NC, K_SCAN,K_RSHSC,NC, K_SCAN,K_RSHSC,NC, K_SCAN,K_RSHSC,NC, 
> K_SCAN,K_RSHSC,NC},
>  {K_ASTER,NC,NC, K_ASTER,NC,NC,  K_ASTER,NC,NC, 0x1b,K_ASTER,NC, 
> 0x1b,0x4e,K_ASTER},
> -{K_SCAN,K_ALTSC,NC, K_SCAN,K_ALTSC,NC, K_SCAN,K_ALTSC,NC, K_SCAN,K_ALTSC,NC,
> -     K_SCAN,K_ALTSC,NC},
> +{K_SCAN,K_ALTSC,NC, K_SCAN,K_ALTSC,NC, K_SCAN,K_ALTSC,NC, K_SCAN,K_ALTSC,NC, 
> K_SCAN,K_ALTSC,NC},
>  {K_SPACE,NC,NC, K_SPACE,NC,NC,  K_NUL,NC,NC,   0x1b,K_SPACE,NC, 
> K_SPACE,NC,NC},
> -{K_SCAN,K_CLCKSC,NC, K_SCAN,K_CLCKSC,NC, K_SCAN,K_CLCKSC,NC,
> -     K_SCAN,K_CLCKSC,NC, K_SCAN,K_CLCKSC,NC},
> +{K_SCAN,K_CLCKSC,NC, K_SCAN,K_CLCKSC,NC, K_SCAN,K_CLCKSC,NC, 
> K_SCAN,K_CLCKSC,NC, K_SCAN,K_CLCKSC,NC},
>  {K_F1,  K_F1S,  K_F1,  K_F1A,  K_F1S},
>  {K_F2,  K_F2S,  K_F2,  K_F2A,  K_F2S},
>  {K_F3,  K_F3S,  K_F3,  K_F3A,  K_F3S},
> @@ -285,20 +280,16 @@ unsigned char   key_map[NUMKEYS][WIDTH_KMAP] = {
>  {K_F8,  K_F8S,  K_F8,  K_F8A,  K_F8S},
>  {K_F9,  K_F9S,  K_F9,  K_F9A,  K_F9S},
>  {K_F10, K_F10S, K_F10, K_F10A, K_F10S},
> -{K_SCAN,K_NLCKSC,NC, K_SCAN,K_NLCKSC,NC, K_SCAN,K_NLCKSC,NC,
> -     K_SCAN,K_NLCKSC,NC, K_SCAN,K_NLCKSC,NC},
> +{K_SCAN,K_NLCKSC,NC, K_SCAN,K_NLCKSC,NC, K_SCAN,K_NLCKSC,NC, 
> K_SCAN,K_NLCKSC,NC, K_SCAN,K_NLCKSC,NC},
>  {K_SCRL,         K_NUL,NC,NC,    K_SCRL,        K_SCRL,      K_NUL,NC,NC},
>  {K_HOME,         K_SEVEN,NC,NC,  K_HOME,        K_HOME,      
> 0x1b,0x4e,K_SEVEN},
>  {K_UA,           K_EIGHT,NC,NC,  K_UA,          K_UA,        
> 0x1b,0x4e,K_EIGHT},
>  {K_PUP,          K_NINE,NC,NC,   K_PUP,         K_PUP,       
> 0x1b,0x4e,K_NINE},
> -{0x1b,0x5b,0x53, K_MINUS,NC,NC,  0x1b,0x5b,0x53, 0x1b,0x5b,0x53,
> -     0x1b,0x4e,0x2d},
> +{0x1b,0x5b,0x53, K_MINUS,NC,NC,  0x1b,0x5b,0x53, 0x1b,0x5b,0x53, 
> 0x1b,0x4e,0x2d},
>  {K_LA,           K_FOUR,NC,NC,   K_LA,          K_LA,        
> 0x1b,0x4e,K_FOUR},
> -{0x1b,0x5b,0x47, K_FIVE,NC,NC,   0x1b,0x5b,0x47, 0x1b,0x5b,0x47,
> -     0x1b,0x4e,0x35},
> +{0x1b,0x5b,0x47, K_FIVE,NC,NC,   0x1b,0x5b,0x47, 0x1b,0x5b,0x47, 
> 0x1b,0x4e,0x35},
>  {K_RA,           K_SIX,NC,NC,    K_RA,          K_RA,        
> 0x1b,0x4e,K_SIX},
> -{0x1b,0x5b,0x54, K_PLUS,NC,NC,   0x1b,0x5b,0x54, 0x1b,0x5b,0x54,
> -     0x1b,0x4e,0x2b},
> +{0x1b,0x5b,0x54, K_PLUS,NC,NC,   0x1b,0x5b,0x54, 0x1b,0x5b,0x54, 
> 0x1b,0x4e,0x2b},
>  {K_END,          K_ONE,NC,NC,    K_END,         K_END,       
> 0x1b,0x4e,K_ONE},
>  {K_DA,           K_TWO,NC,NC,    K_DA,          K_DA,        
> 0x1b,0x4e,K_TWO},
>  {K_PDN,          K_THREE,NC,NC,  K_PDN,         K_PDN,       
> 0x1b,0x4e,K_THREE},
> -- 
> 2.0.0
> 
> 

-- 
Samuel
 Profitant de cette occasion, vous serait-il possible de rebooter 
 aussi Modérator et son petit copain qui gère les ressources de 
 download ?
 -+- OB in NPC : Apprendre à flasher son personnel -+-