From owner-svn-src-all@freebsd.org Sat Jun 15 23:02:11 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9543915D1F0A; Sat, 15 Jun 2019 23:02:11 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 38B248F6E4; Sat, 15 Jun 2019 23:02:11 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 13DF55F02; Sat, 15 Jun 2019 23:02:11 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5FN2AWq019243; Sat, 15 Jun 2019 23:02:10 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5FN297n019226; Sat, 15 Jun 2019 23:02:09 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201906152302.x5FN297n019226@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sat, 15 Jun 2019 23:02:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r349088 - in head: sys/arm/allwinner sys/dev/pwm usr.sbin/pwm X-SVN-Group: head X-SVN-Commit-Author: ian X-SVN-Commit-Paths: in head: sys/arm/allwinner sys/dev/pwm usr.sbin/pwm X-SVN-Commit-Revision: 349088 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 38B248F6E4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jun 2019 23:02:11 -0000 Author: ian Date: Sat Jun 15 23:02:09 2019 New Revision: 349088 URL: https://svnweb.freebsd.org/changeset/base/349088 Log: Make pwm channel numbers unsigned. Modified: head/sys/arm/allwinner/aw_pwm.c head/sys/dev/pwm/pwmbus.c head/sys/dev/pwm/pwmbus.h head/sys/dev/pwm/pwmbus_if.m head/sys/dev/pwm/pwmc.c head/usr.sbin/pwm/pwm.c Modified: head/sys/arm/allwinner/aw_pwm.c ============================================================================== --- head/sys/arm/allwinner/aw_pwm.c Sat Jun 15 23:00:23 2019 (r349087) +++ head/sys/arm/allwinner/aw_pwm.c Sat Jun 15 23:02:09 2019 (r349088) @@ -226,7 +226,7 @@ aw_pwm_detach(device_t dev) } static int -aw_pwm_channel_count(device_t dev, int *nchannel) +aw_pwm_channel_count(device_t dev, u_int *nchannel) { *nchannel = 1; @@ -235,7 +235,7 @@ aw_pwm_channel_count(device_t dev, int *nchannel) } static int -aw_pwm_channel_config(device_t dev, int channel, unsigned int period, unsigned int duty) +aw_pwm_channel_config(device_t dev, u_int channel, u_int period, u_int duty) { struct aw_pwm_softc *sc; uint64_t period_freq, duty_freq; @@ -298,7 +298,7 @@ aw_pwm_channel_config(device_t dev, int channel, unsig } static int -aw_pwm_channel_get_config(device_t dev, int channel, unsigned int *period, unsigned int *duty) +aw_pwm_channel_get_config(device_t dev, u_int channel, u_int *period, u_int *duty) { struct aw_pwm_softc *sc; @@ -311,7 +311,7 @@ aw_pwm_channel_get_config(device_t dev, int channel, u } static int -aw_pwm_channel_enable(device_t dev, int channel, bool enable) +aw_pwm_channel_enable(device_t dev, u_int channel, bool enable) { struct aw_pwm_softc *sc; uint32_t reg; @@ -335,7 +335,7 @@ aw_pwm_channel_enable(device_t dev, int channel, bool } static int -aw_pwm_channel_is_enabled(device_t dev, int channel, bool *enabled) +aw_pwm_channel_is_enabled(device_t dev, u_int channel, bool *enabled) { struct aw_pwm_softc *sc; Modified: head/sys/dev/pwm/pwmbus.c ============================================================================== --- head/sys/dev/pwm/pwmbus.c Sat Jun 15 23:00:23 2019 (r349087) +++ head/sys/dev/pwm/pwmbus.c Sat Jun 15 23:02:09 2019 (r349088) @@ -57,7 +57,7 @@ struct pwmbus_softc { device_t dev; device_t parent; - int nchannels; + u_int nchannels; }; static int @@ -103,43 +103,43 @@ pwmbus_detach(device_t dev) } static int -pwmbus_channel_config(device_t dev, int chan, u_int period, u_int duty) +pwmbus_channel_config(device_t dev, u_int chan, u_int period, u_int duty) { return (PWMBUS_CHANNEL_CONFIG(device_get_parent(dev), chan, period, duty)); } static int -pwmbus_channel_get_config(device_t dev, int chan, u_int *period, u_int *duty) +pwmbus_channel_get_config(device_t dev, u_int chan, u_int *period, u_int *duty) { return (PWMBUS_CHANNEL_GET_CONFIG(device_get_parent(dev), chan, period, duty)); } static int -pwmbus_channel_get_flags(device_t dev, int chan, uint32_t *flags) +pwmbus_channel_get_flags(device_t dev, u_int chan, uint32_t *flags) { return (PWMBUS_CHANNEL_GET_FLAGS(device_get_parent(dev), chan, flags)); } static int -pwmbus_channel_enable(device_t dev, int chan, bool enable) +pwmbus_channel_enable(device_t dev, u_int chan, bool enable) { return (PWMBUS_CHANNEL_ENABLE(device_get_parent(dev), chan, enable)); } static int -pwmbus_channel_set_flags(device_t dev, int chan, uint32_t flags) +pwmbus_channel_set_flags(device_t dev, u_int chan, uint32_t flags) { return (PWMBUS_CHANNEL_SET_FLAGS(device_get_parent(dev), chan, flags)); } static int -pwmbus_channel_is_enabled(device_t dev, int chan, bool *enable) +pwmbus_channel_is_enabled(device_t dev, u_int chan, bool *enable) { return (PWMBUS_CHANNEL_IS_ENABLED(device_get_parent(dev), chan, enable)); } static int -pwmbus_channel_count(device_t dev, int *nchannel) +pwmbus_channel_count(device_t dev, u_int *nchannel) { return (PWMBUS_CHANNEL_COUNT(device_get_parent(dev), nchannel)); } Modified: head/sys/dev/pwm/pwmbus.h ============================================================================== --- head/sys/dev/pwm/pwmbus.h Sat Jun 15 23:00:23 2019 (r349087) +++ head/sys/dev/pwm/pwmbus.h Sat Jun 15 23:02:09 2019 (r349088) @@ -34,7 +34,7 @@ struct pwm_channel { device_t dev; - int channel; + u_int channel; uint64_t period; uint64_t duty; uint32_t flags; Modified: head/sys/dev/pwm/pwmbus_if.m ============================================================================== --- head/sys/dev/pwm/pwmbus_if.m Sat Jun 15 23:00:23 2019 (r349087) +++ head/sys/dev/pwm/pwmbus_if.m Sat Jun 15 23:02:09 2019 (r349088) @@ -33,14 +33,14 @@ INTERFACE pwmbus; CODE { static int - pwm_default_set_flags(device_t dev, int channel, uint32_t flags) + pwm_default_set_flags(device_t dev, u_int channel, uint32_t flags) { return (EOPNOTSUPP); } static int - pwm_default_get_flags(device_t dev, int channel, uint32_t *flags) + pwm_default_get_flags(device_t dev, u_int channel, uint32_t *flags) { *flags = 0; @@ -54,7 +54,7 @@ CODE { # METHOD int channel_config { device_t bus; - int channel; + u_int channel; unsigned int period; unsigned int duty; }; @@ -65,7 +65,7 @@ METHOD int channel_config { # METHOD int channel_get_config { device_t bus; - int channel; + u_int channel; unsigned int *period; unsigned int *duty; }; @@ -75,7 +75,7 @@ METHOD int channel_get_config { # METHOD int channel_set_flags { device_t bus; - int channel; + u_int channel; uint32_t flags; } DEFAULT pwm_default_set_flags; @@ -84,7 +84,7 @@ METHOD int channel_set_flags { # METHOD int channel_get_flags { device_t dev; - int channel; + u_int channel; uint32_t *flags; } DEFAULT pwm_default_get_flags; @@ -93,7 +93,7 @@ METHOD int channel_get_flags { # METHOD int channel_enable { device_t bus; - int channel; + u_int channel; bool enable; }; @@ -102,7 +102,7 @@ METHOD int channel_enable { # METHOD int channel_is_enabled { device_t bus; - int channel; + u_int channel; bool *enabled; }; @@ -111,5 +111,5 @@ METHOD int channel_is_enabled { # METHOD int channel_count { device_t bus; - int *nchannel; + u_int *nchannel; }; Modified: head/sys/dev/pwm/pwmc.c ============================================================================== --- head/sys/dev/pwm/pwmc.c Sat Jun 15 23:00:23 2019 (r349087) +++ head/sys/dev/pwm/pwmc.c Sat Jun 15 23:02:09 2019 (r349088) @@ -54,7 +54,7 @@ pwm_ioctl(struct cdev *dev, u_long cmd, caddr_t data, struct pwmc_softc *sc; struct pwm_state state; device_t bus; - int nchannel; + u_int nchannel; int rv = 0; sc = dev->si_drv1; @@ -62,7 +62,7 @@ pwm_ioctl(struct cdev *dev, u_long cmd, caddr_t data, switch (cmd) { case PWMMAXCHANNEL: - nchannel = -1; + nchannel = 0; rv = PWMBUS_CHANNEL_COUNT(bus, &nchannel); bcopy(&nchannel, data, sizeof(nchannel)); break; Modified: head/usr.sbin/pwm/pwm.c ============================================================================== --- head/usr.sbin/pwm/pwm.c Sat Jun 15 23:00:23 2019 (r349087) +++ head/usr.sbin/pwm/pwm.c Sat Jun 15 23:02:09 2019 (r349088) @@ -66,7 +66,7 @@ main(int argc, char *argv[]) { struct pwm_state state; int fd; - int channel, nchannels; + u_int channel, nchannels; int period, duty; int action, ch; cap_rights_t right_ioctl; @@ -75,7 +75,7 @@ main(int argc, char *argv[]) action = 0; fd = -1; - channel = -1; + channel = -1u; period = duty = -1; while ((ch = getopt(argc, argv, "f:c:EDCp:d:")) != -1) { @@ -110,9 +110,9 @@ main(int argc, char *argv[]) usage(); break; case 'c': - if (channel != -1) + if (channel != -1u) usage(); - channel = strtol(optarg, NULL, 10); + channel = strtoul(optarg, NULL, 10); break; case 'f': if ((fd = open(optarg, O_RDWR)) < 0) {