From 7fdad178eacc5edfe80aa9a83b005fa53b1b8ffe Mon Sep 17 00:00:00 2001 From: miod Date: Thu, 24 Jul 2014 19:19:26 +0000 Subject: [PATCH] Shunt hwupdate property decoding in sparc's old prom (sun4 only) if defined(SMALL). --- usr.sbin/eeprom/eehandlers.c | 4 +++- usr.sbin/eeprom/main.c | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/usr.sbin/eeprom/eehandlers.c b/usr.sbin/eeprom/eehandlers.c index 74df66c2fad..1257027ee51 100644 --- a/usr.sbin/eeprom/eehandlers.c +++ b/usr.sbin/eeprom/eehandlers.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eehandlers.c,v 1.17 2013/12/03 01:48:37 millert Exp $ */ +/* $OpenBSD: eehandlers.c,v 1.18 2014/07/24 19:19:26 miod Exp $ */ /* $NetBSD: eehandlers.c,v 1.2 1996/02/28 01:13:22 thorpej Exp $ */ /*- @@ -82,6 +82,7 @@ static int doio(struct keytabent *, u_char *, ssize_t, int); return; \ } +#ifndef SMALL void ee_hwupdate(struct keytabent *ktent, char *arg) { @@ -112,6 +113,7 @@ ee_hwupdate(struct keytabent *ktent, char *arg) printf("%s=%d (%s)\n", ktent->kt_keyword, t, cp); } +#endif void ee_num8(struct keytabent *ktent, char *arg) diff --git a/usr.sbin/eeprom/main.c b/usr.sbin/eeprom/main.c index 3b80221522a..3500fbb366f 100644 --- a/usr.sbin/eeprom/main.c +++ b/usr.sbin/eeprom/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.18 2008/06/26 05:42:21 ray Exp $ */ +/* $OpenBSD: main.c,v 1.19 2014/07/24 19:19:26 miod Exp $ */ /* $NetBSD: main.c,v 1.3 1996/05/16 16:00:55 thorpej Exp $ */ /*- @@ -53,7 +53,11 @@ static char *nlistf = NULL; struct keytabent eekeytab[] = { +#ifndef SMALL { "hwupdate", 0x10, ee_hwupdate }, +#else + { "hwupdate", 0x00, ee_notsupp }, +#endif { "memsize", 0x14, ee_num8 }, { "memtest", 0x15, ee_num8 }, { "scrsize", 0x16, ee_screensize }, -- 2.20.1