Remove references to xf86Info.kbd* from solaris code
This commit is contained in:
		
							parent
							
								
									e46f7f78b3
								
							
						
					
					
						commit
						7dc54a40e9
					
				| 
						 | 
				
			
			@ -291,23 +291,6 @@ xf86CloseConsole(void)
 | 
			
		|||
#endif /* HAS_USL_VTS */
 | 
			
		||||
 | 
			
		||||
    close(xf86Info.consoleFd);
 | 
			
		||||
 | 
			
		||||
#if defined(__SOL8__) || !defined(i386)
 | 
			
		||||
 | 
			
		||||
    /*
 | 
			
		||||
     * This probably shouldn't be here.  However, there is no corresponding
 | 
			
		||||
     * xf86CloseKbd() routine - DWH
 | 
			
		||||
     */
 | 
			
		||||
 | 
			
		||||
    /* Set the keyboard into "indirect" mode and turn off even translation */
 | 
			
		||||
    tmp = 0;
 | 
			
		||||
    (void) ioctl(xf86Info.kbdFd, KIOCSDIRECT, &tmp);
 | 
			
		||||
    tmp = TR_ASCII;
 | 
			
		||||
    (void) ioctl(xf86Info.kbdFd, KIOCTRANS, &tmp);
 | 
			
		||||
 | 
			
		||||
    close(xf86Info.kbdFd);
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int
 | 
			
		||||
| 
						 | 
				
			
			@ -357,16 +340,6 @@ xf86ProcessArgument(int argc, char **argv, int i)
 | 
			
		|||
	    fb_dev[PATH_MAX - 1] = '\0';
 | 
			
		||||
	    return 2;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (!strcmp(argv[i], "-ar1")) {
 | 
			
		||||
	    xf86Info.kbdDelay = atoi(argv[i + 1]) * 1000;
 | 
			
		||||
	    return 2;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (!strcmp(argv[i], "-ar2")) {
 | 
			
		||||
	    xf86Info.kbdRate = atoi(argv[i + 1]) * 1000;
 | 
			
		||||
	    return 2;
 | 
			
		||||
	}
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			@ -381,10 +354,6 @@ void xf86UseMsg()
 | 
			
		|||
#endif
 | 
			
		||||
#if defined(__SOL8__) || !defined(i386)
 | 
			
		||||
    ErrorF("-dev <fb>              Framebuffer device\n");
 | 
			
		||||
    ErrorF("-ar1 <float>           Set autorepeat initiate time (sec)\n");
 | 
			
		||||
    ErrorF("                       (if not using XKB)\n");
 | 
			
		||||
    ErrorF("-ar2 <float>           Set autorepeat interval time (sec)\n");
 | 
			
		||||
    ErrorF("                       (if not using XKB)\n");
 | 
			
		||||
#endif
 | 
			
		||||
    ErrorF("-keeptty               Don't detach controlling tty\n");
 | 
			
		||||
    ErrorF("                       (for debugging only)\n");
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue