Index: head/usr.sbin/pwm/pwm.8 =================================================================== --- head/usr.sbin/pwm/pwm.8 (revision 349143) +++ head/usr.sbin/pwm/pwm.8 (revision 349144) @@ -1,108 +1,115 @@ .\" Copyright (c) 2018 Emmanuel Vadot .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" .\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. .\" IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT, .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, .\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD$ .\" -.Dd January 12, 2019 +.Dd June 17, 2019 .Dt PWM 8 .Os .Sh NAME .Nm pwm .Nd configure pwm controller .Sh SYNOPSIS .Nm .Op Fl f Ar device .Fl c Ar channel .Fl E .Nm .Op Fl f Ar device .Fl c Ar channel .Fl D .Nm .Op Fl f Ar device .Fl c Ar channel .Fl C .Nm .Op Fl f Ar device .Fl c Ar channel .Fl p Ar period .Nm .Op Fl f Ar device .Fl c Ar channel .Fl d Ar duty .Sh DESCRIPTION The .Nm utility can be used to configure pwm controllers. .Pp The options are as follow: .Bl -tag -width "-c channel" .It Fl c Ar channel Channel number to operate on .It Fl f Ar device Device to operate on. If not specified, -.Pa /dev/pwmc0 +.Pa /dev/pwm/pwmc0.0 is used. +If an unqualified name is provided, +.Pa /dev/pwm +is automatically prepended. .It Fl E Enable the pwm channel .It Fl D Disable the pwm channel .It Fl C Show the configuration of the pwm channel .It Fl p Ar period Configure the period (in nanoseconds) of the pwm channel .It Fl d Ar duty Configure the duty (in nanoseconds or percentage) of the pwm channel .El .Sh EXAMPLES .Bl -bullet .It Show the configuration of the pwm channel: .Bd -literal -pwm -f /dev/pwmc0 -C +pwm -f /dev/pwm/pwmc0.1 -C .Ed .It -Configure a 50000 ns period and a 25000 duty cycle: +Configure a 50000 ns period and a 25000 ns duty cycle: .Bd -literal -pwm -f /dev/pwmc0 -p 50000 -d 25000 +pwm -f pwmc1.1 -p 50000 -d 25000 .Ed .It -Configure a 50% duty cycle: +Configure a 50% duty cycle on the device and channel which +were configured in +.Xr pwmc 4 +to have the label +.Pa backlight : .Bd -literal -pwm -f /dev/pwmc0 -d 50% +pwm -f backlight -d 50% .Ed .El .Sh SEE ALSO .Xr pwm 9 , .Xr pwmbus 9 .Sh HISTORY The .Nm utility appeared in .Fx 13.0 . .Sh AUTHORS .An -nosplit The .Nm utility and this manual page were written by .An Emmanuel Vadot Aq Mt manu@FreeBSD.org . Index: head/usr.sbin/pwm/pwm.c =================================================================== --- head/usr.sbin/pwm/pwm.c (revision 349143) +++ head/usr.sbin/pwm/pwm.c (revision 349144) @@ -1,225 +1,239 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2018 Emmanuel Vadot * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #include #include #include #include #include #include #include #include +#include #include #include #include #include #include #define PWM_ENABLE 0x0001 #define PWM_DISABLE 0x0002 #define PWM_SHOW_CONFIG 0x0004 #define PWM_PERIOD 0x0008 #define PWM_DUTY 0x0010 +static char device_name[PATH_MAX] = "/dev/pwm/pwmc0.0"; + static void +set_device_name(const char *name) +{ + + if (name[0] == '/') + strlcpy(device_name, name, sizeof(device_name)); + else + snprintf(device_name, sizeof(device_name), "/dev/pwm/%s", name); +} + +static void usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, "\tpwm [-f dev] -c channel -E\n"); fprintf(stderr, "\tpwm [-f dev] -c channel -D\n"); fprintf(stderr, "\tpwm [-f dev] -c channel -C\n"); fprintf(stderr, "\tpwm [-f dev] -c channel -p period\n"); fprintf(stderr, "\tpwm [-f dev] -c channel -d duty\n"); exit(1); } int main(int argc, char *argv[]) { struct pwm_state state; int fd; u_int channel, nchannels; int period, duty; int action, ch; cap_rights_t right_ioctl; const unsigned long pwm_ioctls[] = {PWMGETSTATE, PWMSETSTATE, PWMMAXCHANNEL}; char *percent; + bool setname; action = 0; + setname = false; fd = -1; channel = -1u; period = duty = -1; while ((ch = getopt(argc, argv, "f:c:EDCp:d:")) != -1) { switch (ch) { case 'E': if (action) usage(); action = PWM_ENABLE; break; case 'D': if (action) usage(); action = PWM_DISABLE; break; case 'C': if (action) usage(); action = PWM_SHOW_CONFIG; break; case 'p': if (action & ~(PWM_PERIOD | PWM_DUTY)) usage(); action = PWM_PERIOD; period = strtol(optarg, NULL, 10); break; case 'd': if (action & ~(PWM_PERIOD | PWM_DUTY)) usage(); action = PWM_DUTY; duty = strtol(optarg, &percent, 10); if (*percent != '\0' && *percent != '%') usage(); break; case 'c': if (channel != -1u) usage(); channel = strtoul(optarg, NULL, 10); break; case 'f': - if ((fd = open(optarg, O_RDWR)) < 0) { - fprintf(stderr, "pwm: cannot open %s %s\n", - optarg, strerror(errno)); - exit(1); - } + setname = true; + set_device_name(optarg); + break; } } - if (fd == -1) { - if ((fd = open("/dev/pwmc0", O_RDWR)) < 0) { - fprintf(stderr, "pwm: cannot open %s %s\n", - optarg, strerror(errno)); + if (action == 0) + usage(); + + if ((fd = open(device_name, O_RDWR)) == -1) { + fprintf(stderr, "pwm: cannot open %s: %s\n", + device_name, strerror(errno)); + if (setname) exit(1); - } + else + usage(); } - - if (action == 0 || fd == -1) - usage(); if (caph_limit_stdio() < 0) { fprintf(stderr, "can't limit stdio rights"); goto fail; } caph_cache_catpages(); cap_rights_init(&right_ioctl, CAP_IOCTL); if (caph_rights_limit(fd, &right_ioctl) < 0) { fprintf(stderr, "cap_right_limit() failed\n"); goto fail; } if (caph_ioctls_limit(fd, pwm_ioctls, nitems(pwm_ioctls)) < 0) { fprintf(stderr, "caph_ioctls_limit() failed\n"); goto fail; } if (caph_enter() < 0) { fprintf(stderr, "failed to enter capability mode\n"); goto fail; } /* Check if the channel is correct */ if (ioctl(fd, PWMMAXCHANNEL, &nchannels) == -1) { fprintf(stderr, "ioctl: %s\n", strerror(errno)); goto fail; } if (channel > nchannels) { fprintf(stderr, "pwm controller only support %d channels\n", nchannels); goto fail; } /* Fill the common args */ state.channel = channel; if (ioctl(fd, PWMGETSTATE, &state) == -1) { fprintf(stderr, "Cannot get current state of the pwm controller\n"); goto fail; } switch (action) { case PWM_ENABLE: if (state.enable == false) { state.enable = true; if (ioctl(fd, PWMSETSTATE, &state) == -1) { fprintf(stderr, "Cannot enable the pwm controller\n"); goto fail; } } break; case PWM_DISABLE: if (state.enable == true) { state.enable = false; if (ioctl(fd, PWMSETSTATE, &state) == -1) { fprintf(stderr, "Cannot disable the pwm controller\n"); goto fail; } } break; case PWM_SHOW_CONFIG: printf("period: %u\nduty: %u\nenabled:%d\n", state.period, state.duty, state.enable); break; case PWM_PERIOD: case PWM_DUTY: if (period != -1) state.period = period; if (duty != -1) { if (*percent != '\0') state.duty = state.period * duty / 100; else state.duty = duty; } if (ioctl(fd, PWMSETSTATE, &state) == -1) { fprintf(stderr, "Cannot configure the pwm controller\n"); goto fail; } break; } close(fd); return (0); fail: close(fd); return (1); }