Skip to content

Commit

Permalink
s390/con3270: optionally disable auto update
Browse files Browse the repository at this point in the history
This patch adds a parameter 'auto_update' to the con3270
driver, causing the 'auto_update' feature to be disabled
if unset.
The 'auto_update' feature will cause the con3270 driver
to switch to the console view whenever new system messages
are displayed, which makes working on the 3270 terminal
awkward.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Martin Schwidefsky committed Mar 26, 2014
1 parent 6e5a40a commit 233faec
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/s390/char/con3270.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Copyright IBM Corp. 2003, 2009
*/

#include <linux/module.h>
#include <linux/console.h>
#include <linux/init.h>
#include <linux/interrupt.h>
Expand All @@ -30,6 +31,9 @@

static struct raw3270_fn con3270_fn;

static bool auto_update = 1;
module_param(auto_update, bool, 0);

/*
* Main 3270 console view data structure.
*/
Expand Down Expand Up @@ -204,6 +208,8 @@ con3270_update(struct con3270 *cp)
struct string *s, *n;
int rc;

if (!auto_update && !raw3270_view_active(&cp->view))
return;
if (cp->view.dev)
raw3270_activate_view(&cp->view);

Expand Down Expand Up @@ -529,6 +535,7 @@ con3270_flush(void)
if (!cp->view.dev)
return;
raw3270_pm_unfreeze(&cp->view);
raw3270_activate_view(&cp->view);
spin_lock_irqsave(&cp->view.lock, flags);
con3270_wait_write(cp);
cp->nr_up = 0;
Expand Down
9 changes: 9 additions & 0 deletions drivers/s390/char/raw3270.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,15 @@ __raw3270_start(struct raw3270 *rp, struct raw3270_view *view,
return 0;
}

int
raw3270_view_active(struct raw3270_view *view)
{
struct raw3270 *rp = view->dev;

return rp && rp->view == view &&
!test_bit(RAW3270_FLAGS_FROZEN, &rp->flags);
}

int
raw3270_start(struct raw3270_view *view, struct raw3270_request *rq)
{
Expand Down
1 change: 1 addition & 0 deletions drivers/s390/char/raw3270.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ int raw3270_start_locked(struct raw3270_view *, struct raw3270_request *);
int raw3270_start_irq(struct raw3270_view *, struct raw3270_request *);
int raw3270_reset(struct raw3270_view *);
struct raw3270_view *raw3270_view(struct raw3270_view *);
int raw3270_view_active(struct raw3270_view *);

/* Reference count inliner for view structures. */
static inline void
Expand Down

0 comments on commit 233faec

Please sign in to comment.