View | Details | Raw Unified | Return to bug 357881
Collapse All | Expand All

(-)file_not_specified_in_diff (-3 / +5 lines)
Line  Link Here
0 
-- linux-2.6.22-SL103_BRANCH.orig/drivers/input/mouse/alps.c
 0 
++ linux-2.6.22-SL103_BRANCH/drivers/input/mouse/alps.c
Lines 48-58 static const struct alps_model_info alps Link Here
48 
	{ { 0x63, 0x02, 0x50 },	0xef, 0xef, ALPS_FW_BK_1 },		/* NEC Versa L320 */
 48 
	{ { 0x63, 0x02, 0x50 },	0xef, 0xef, ALPS_FW_BK_1 },		/* NEC Versa L320 */
49 
	{ { 0x63, 0x02, 0x64 },	0xf8, 0xf8, 0 },
 49 
	{ { 0x63, 0x02, 0x64 },	0xf8, 0xf8, 0 },
50 
	{ { 0x63, 0x03, 0xc8 }, 0xf8, 0xf8, ALPS_PASS },		/* Dell Latitude D800 */
 50 
	{ { 0x63, 0x03, 0xc8 }, 0xf8, 0xf8, ALPS_PASS },		/* Dell Latitude D800 */
51 
	{ { 0x73, 0x00, 0x0a },	0xf8, 0xf8, ALPS_DUALPOINT },		/* ThinkPad R61 8918-5QG */
51 
	{ { 0x73, 0x02, 0x0a },	0xf8, 0xf8, 0 },
 52 
	{ { 0x73, 0x02, 0x0a },	0xf8, 0xf8, 0 },
52 
	{ { 0x73, 0x02, 0x14 },	0xf8, 0xf8, ALPS_FW_BK_2 },		/* Ahtec Laptop */
 53 
	{ { 0x73, 0x02, 0x14 },	0xf8, 0xf8, ALPS_FW_BK_2 },		/* Ahtec Laptop */
53 
	{ { 0x20, 0x02, 0x0e },	0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* XXX */
 54 
	{ { 0x20, 0x02, 0x0e },	0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* XXX */
54 
	{ { 0x22, 0x02, 0x0a },	0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },
 55 
	{ { 0x22, 0x02, 0x0a },	0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },
55 
	{ { 0x22, 0x02, 0x14 }, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D600 */
 56 
	{ { 0x22, 0x02, 0x14 }, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D600 */
57 
	{ { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FW_BK_1 } /* Dell Vostro 1400 */
56 
};
 58 
};
57 

          59
          

        

        

          58
          
/*

          60
          
/*

        

  

    
      
            Lines 114-121
          static void alps_process_packet(struct p
      
      
        Link Here
      
    
  

        

          114
          
	}

          116
          
	}

        

        

          115
          

          117
          

        

        

          116
          
	if (priv->i->flags & ALPS_FW_BK_1) {

          118
          
	if (priv->i->flags & ALPS_FW_BK_1) {

        

          
            

              117
              
		back = packet[2] & 4;


              119
              
		back = packet[0] & 0x10;

            

            

              118
              
		forward = packet[0] & 0x10;


              120
              
		forward = packet[2] & 4;

            

        

          119
          
	}

          121
          
	}

        

        

          120
          

          122
          

        

        

          121
          
	if (priv->i->flags & ALPS_FW_BK_2) {

          123
          
	if (priv->i->flags & ALPS_FW_BK_2) {

        






  

  Return to bug 357881