|
@@ -16,37 +16,6 @@
|
|
|
|
|
|
extern void restore_current(void);
|
|
extern void restore_current(void);
|
|
|
|
|
|
-/* Non blocking get character from console input device, returns -1
|
|
|
|
- * if no input was taken. This can be used for polling.
|
|
|
|
- */
|
|
|
|
-static int prom_nbgetchar(char *buf)
|
|
|
|
-{
|
|
|
|
- unsigned long flags;
|
|
|
|
- int i = -1;
|
|
|
|
-
|
|
|
|
- spin_lock_irqsave(&prom_lock, flags);
|
|
|
|
- switch(prom_vers) {
|
|
|
|
- case PROM_V0:
|
|
|
|
- i = (*(romvec->pv_nbgetchar))();
|
|
|
|
- if (i != -1) {
|
|
|
|
- *buf = i;
|
|
|
|
- i = 0;
|
|
|
|
- }
|
|
|
|
- break;
|
|
|
|
- case PROM_V2:
|
|
|
|
- case PROM_V3:
|
|
|
|
- if ((*(romvec->pv_v2devops).v2_dev_read)(*romvec->pv_v2bootargs.fd_stdin,
|
|
|
|
- buf, 0x1) == 1)
|
|
|
|
- i = 0;
|
|
|
|
- break;
|
|
|
|
- default:
|
|
|
|
- break;
|
|
|
|
- };
|
|
|
|
- restore_current();
|
|
|
|
- spin_unlock_irqrestore(&prom_lock, flags);
|
|
|
|
- return i; /* Ugh, we could spin forever on unsupported proms ;( */
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
/* Non blocking put character to console device, returns -1 if
|
|
/* Non blocking put character to console device, returns -1 if
|
|
* unsuccessful.
|
|
* unsuccessful.
|
|
*/
|
|
*/
|
|
@@ -74,16 +43,6 @@ static int prom_nbputchar(const char *buf)
|
|
return i; /* Ugh, we could spin forever on unsupported proms ;( */
|
|
return i; /* Ugh, we could spin forever on unsupported proms ;( */
|
|
}
|
|
}
|
|
|
|
|
|
-/* Blocking version of get character routine above. */
|
|
|
|
-void prom_getchar(char *buf)
|
|
|
|
-{
|
|
|
|
- while (1) {
|
|
|
|
- int err = prom_nbgetchar(buf);
|
|
|
|
- if (!err)
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
/* Blocking version of put character routine above. */
|
|
/* Blocking version of put character routine above. */
|
|
void prom_putchar(const char *buf)
|
|
void prom_putchar(const char *buf)
|
|
{
|
|
{
|