svn commit: r305555 - in stable: 10/sys/dev/ppbus 11/sys/dev/ppbus 9/sys/dev/ppbus

[Dimitry Andric]

Author: dim
Date: Wed Sep  7 19:02:47 2016
New Revision: 305555
URL: https://svnweb.freebsd.org/changeset/base/305555

Log:
  MFC r305345:
  
  With clang 3.9.0, compiling ppbus(4) results in the following warnings:
  
  sys/dev/ppbus/ppb_1284.c:296:46: error: implicit conversion from 'int'
  to 'char' changes value from 144 to -112 [-Werror,-Wconstant-conversion]
  	if ((error = do_peripheral_wait(bus, SELECT | nBUSY, 0))) {
  		     ~~~~~~~~~~~~~~~~~~      ~~~~~~~^~~~~~~
  sys/dev/ppbus/ppb_1284.c:785:48: error: implicit conversion from 'int'
  to 'char' changes value from 240 to -16 [-Werror,-Wconstant-conversion]
  		if (do_1284_wait(bus, nACK | SELECT | PERROR | nBUSY,
  		    ~~~~~~~~~~~~      ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
  sys/dev/ppbus/ppb_1284.c:786:29: error: implicit conversion from 'int'
  to 'char' changes value from 240 to -16 [-Werror,-Wconstant-conversion]
  					nACK | SELECT | PERROR | nBUSY)) {
  					~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
  
  This is because nBUSY is 0x80, so the plain char argument is wrapped to
  a negative value.  Fix this in a minimal fashion, by using uint8_t in a
  few places.
  
  Reviewed by:	emaste
  Differential Revision: https://reviews.freebsd.org/D7771

Modified:
  stable/9/sys/dev/ppbus/ppb_1284.c
  stable/9/sys/dev/ppbus/ppb_base.c
  stable/9/sys/dev/ppbus/ppbconf.h
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/dev/ppbus/ppb_1284.c
  stable/10/sys/dev/ppbus/ppb_base.c
  stable/10/sys/dev/ppbus/ppbconf.h
  stable/11/sys/dev/ppbus/ppb_1284.c
  stable/11/sys/dev/ppbus/ppb_base.c
  stable/11/sys/dev/ppbus/ppbconf.h
Directory Properties:
  stable/10/   (props changed)
  stable/11/   (props changed)

Modified: stable/9/sys/dev/ppbus/ppb_1284.c
==============================================================================
--- stable/9/sys/dev/ppbus/ppb_1284.c	Wed Sep  7 18:53:46 2016	(r305554)
+++ stable/9/sys/dev/ppbus/ppb_1284.c	Wed Sep  7 19:02:47 2016	(r305555)
@@ -57,13 +57,13 @@ __FBSDID("$FreeBSD$");
  * Wait for the peripherial up to 40ms
  */
 static int
-do_1284_wait(device_t bus, char mask, char status)
+do_1284_wait(device_t bus, uint8_t mask, uint8_t status)
 {
 	return (ppb_poll_bus(bus, 4, mask, status, PPB_NOINTR | PPB_POLL));
 }
 
 static int
-do_peripheral_wait(device_t bus, char mask, char status)
+do_peripheral_wait(device_t bus, uint8_t mask, uint8_t status)
 {
 	return (ppb_poll_bus(bus, 100, mask, status, PPB_NOINTR | PPB_POLL));
 }

Modified: stable/9/sys/dev/ppbus/ppb_base.c
==============================================================================
--- stable/9/sys/dev/ppbus/ppb_base.c	Wed Sep  7 18:53:46 2016	(r305554)
+++ stable/9/sys/dev/ppbus/ppb_base.c	Wed Sep  7 19:02:47 2016	(r305555)
@@ -54,11 +54,11 @@ MODULE_VERSION(ppbus, 1);
  */
 int
 ppb_poll_bus(device_t bus, int max,
-	     char mask, char status, int how)
+	     uint8_t mask, uint8_t status, int how)
 {
 	struct ppb_data *ppb = DEVTOSOFTC(bus);
 	int i, j, error;
-	char r;
+	uint8_t r;
 
 	ppb_assert_locked(bus);
 
@@ -186,7 +186,7 @@ ppb_ecp_sync(device_t bus)
 int
 ppb_get_status(device_t bus, struct ppb_status *status)
 {
-	register char r;
+	uint8_t r;
 
 	ppb_assert_locked(bus);
 

Modified: stable/9/sys/dev/ppbus/ppbconf.h
==============================================================================
--- stable/9/sys/dev/ppbus/ppbconf.h	Wed Sep  7 18:53:46 2016	(r305554)
+++ stable/9/sys/dev/ppbus/ppbconf.h	Wed Sep  7 19:02:47 2016	(r305555)
@@ -263,7 +263,7 @@ extern void _ppb_assert_locked(device_t,
 extern void ppb_init_callout(device_t, struct callout *, int);
 extern int ppb_sleep(device_t, void *, int, const char *, int);
 extern int ppb_get_status(device_t, struct ppb_status *);
-extern int ppb_poll_bus(device_t, int, char, char, int);
+extern int ppb_poll_bus(device_t, int, uint8_t, uint8_t, int);
 extern int ppb_reset_epp_timeout(device_t);
 extern int ppb_ecp_sync(device_t);
 extern int ppb_get_epp_protocol(device_t);