[PATCH] hvc_console: Register ops when setting up hvc_console
When registering the hvc console port, register a list of ops (read and write)
to go with it, instead of calling fixed function names.
This allows different ports to encode the data differently.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index df282cc..cddb789 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -85,6 +85,7 @@
char outbuf[N_OUTBUF] __ALIGNED__;
int n_outbuf;
uint32_t vtermno;
+ struct hv_ops *ops;
int irq_requested;
int irq;
struct list_head next;
@@ -142,6 +143,7 @@
* console interfaces but can still be used as a tty device. This has to be
* static because kmalloc will not work during early console init.
*/
+static struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES];
static uint32_t vtermnos[MAX_NR_HVC_CONSOLES] =
{[0 ... MAX_NR_HVC_CONSOLES - 1] = -1};
@@ -154,14 +156,14 @@
{
char c[16] __ALIGNED__;
unsigned i = 0, n = 0;
- int r, donecr = 0;
+ int r, donecr = 0, index = co->index;
/* Console access attempt outside of acceptable console range. */
- if (co->index >= MAX_NR_HVC_CONSOLES)
+ if (index >= MAX_NR_HVC_CONSOLES)
return;
/* This console adapter was removed so it is not useable. */
- if (vtermnos[co->index] < 0)
+ if (vtermnos[index] < 0)
return;
while (count > 0 || i > 0) {
@@ -175,7 +177,7 @@
--count;
}
} else {
- r = hvc_put_chars(vtermnos[co->index], c, i);
+ r = cons_ops[index]->put_chars(vtermnos[index], c, i);
if (r < 0) {
/* throw away chars on error */
i = 0;
@@ -245,7 +247,7 @@
* vty adapters do NOT get an hvc_instantiate() callback since they
* appear after early console init.
*/
-int hvc_instantiate(uint32_t vtermno, int index)
+int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops)
{
struct hvc_struct *hp;
@@ -263,6 +265,7 @@
}
vtermnos[index] = vtermno;
+ cons_ops[index] = ops;
/* reserve all indices upto and including this index */
if (last_hvc < index)
@@ -466,7 +469,7 @@
{
int n;
- n = hvc_put_chars(hp->vtermno, hp->outbuf, hp->n_outbuf);
+ n = hp->ops->put_chars(hp->vtermno, hp->outbuf, hp->n_outbuf);
if (n <= 0) {
if (n == 0)
return;
@@ -604,7 +607,7 @@
break;
}
- n = hvc_get_chars(hp->vtermno, buf, count);
+ n = hp->ops->get_chars(hp->vtermno, buf, count);
if (n <= 0) {
/* Hangup the tty when disconnected from host */
if (n == -EPIPE) {
@@ -737,7 +740,8 @@
.release = destroy_hvc_struct,
};
-struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int irq)
+struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int irq,
+ struct hv_ops *ops)
{
struct hvc_struct *hp;
int i;
@@ -750,6 +754,7 @@
hp->vtermno = vtermno;
hp->irq = irq;
+ hp->ops = ops;
kobject_init(&hp->kobj);
hp->kobj.ktype = &hvc_kobj_type;