From nobody Fri Jul 07 05:10:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qy1gZ1b35z4mF2J; Fri, 7 Jul 2023 05:10:34 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qy1gZ0M0Jz4HlX; Fri, 7 Jul 2023 05:10:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688706634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cy5Fxb5ZCQj4p8s7Gj+Ka36PB/V0+xVzzqxconkA8pY=; b=PXaes9wlHVlwh8y0wVSfV0bBcwS73S+AuyaiT0lfz7oUn63HKXQD/XO95lkUkf5ZC8ureu RVjXtOceR64ChsRwtPG8ILS6LGif1bymJ9tE4GwUR+x6pznSucPcUwlzQsWnRXHQm2Xac7 vEegZuzKItafBriZloqhsi1ZsqJZLUthzfg59LcKXFWJ1jgALuSz3QPR32uyP1ib0DF0r/ NfM3nH3dG8LcCdsR3+ewP64B/XXt4ONj3b2X5n1QoxM0a0AkeCEq+kbFsL6AE0tiQk6AEz E1A+fQDu/YNEXBFnAwHqiKitAg0g306bPbpOVtPb7sVUJ+Is9JHtWiBu9sN5kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688706634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cy5Fxb5ZCQj4p8s7Gj+Ka36PB/V0+xVzzqxconkA8pY=; b=Acf43kZdVGHgrzR0wUpIYPI/8uCGMtS4HCNWfffr+VHvqX4DKLnNmn04XT9lh97GiXf7hO 5lRDLarGXr8JQUZM0AeqbyjdMGjHyY85lXWfLOuTUS8XbBKoHPV69CTAFYs0rlwAyluOr9 TEZCtiwOKg0Tf184fQv0CdYvh6qGd48cFyTY+J1dXI0Kmdz2uEegs+wRx51IM3tu4CH4se RQaSjJDGE5umvuBbMoYI084gUX59YoJRJz2ubV5CQA/zBzyLsFHc8flm1N/8/DYYAU4H5E sgWVlnIVKe95taSZHeE8f8Eix5VFsGZN8+B/HIU4A6VzA47JnLoqNSMAX9d1PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688706634; a=rsa-sha256; cv=none; b=wyoNr9eEctCkvIi6AnDPnwRC+cATiAtEqmJpEWfcDszRvgmNz7KlMkIxK8DqKaOp9Nh+EW Orxt2w+V8YDBCDQaWP9rE6eBPSi1vaKykIN5l77ahqgRitfJ/npKrRMEQwWZZnGhk4FJSY tYEApxwkbsnUf66klkXhEnxu0igwA1vSytkBCpBrBu/n9+3wvPH0VtervlMc6t8IRf5nEk xfR/2SIL/KujXv17eXNs+i0yh+HyCZquJGS7E//2Fg83BaGJKz7FgFXsMkLNkPiXZbwvJ1 ycqc8L/ncAYETZM44UcTNAryQubMOfcsUAjrxfzJ5VeWElGcLWfn8pvQtYYywQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qy1gY61XFzRBC; Fri, 7 Jul 2023 05:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3675AXSt051172; Fri, 7 Jul 2023 05:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3675AX05051171; Fri, 7 Jul 2023 05:10:33 GMT (envelope-from git) Date: Fri, 7 Jul 2023 05:10:33 GMT Message-Id: <202307070510.3675AX05051171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 761ab48d6af8 - main - kbdcontrol: Remove compat code for 4.x -> 5.x transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 761ab48d6af8e949452a64e2baa279c85c848cbb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=761ab48d6af8e949452a64e2baa279c85c848cbb commit 761ab48d6af8e949452a64e2baa279c85c848cbb Author: Warner Losh AuthorDate: 2023-07-07 05:08:01 +0000 Commit: Warner Losh CommitDate: 2023-07-07 05:10:18 +0000 kbdcontrol: Remove compat code for 4.x -> 5.x transition I think we're safely past that now... Sponsored by: Netflix --- usr.sbin/kbdcontrol/kbdcontrol.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c index 614734e6123a..d7a0ff5ecfd0 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.c +++ b/usr.sbin/kbdcontrol/kbdcontrol.c @@ -46,20 +46,6 @@ __FBSDID("$FreeBSD$"); #include "path.h" #include "lex.h" -/* - * HALT, PDWN, and PASTE aren't defined in 4.x, but we need them to bridge - * to 5.0-current so define them here as a stop gap transition measure. - */ -#ifndef HALT -#define HALT 0xa1 /* halt machine */ -#endif -#ifndef PDWN -#define PDWN 0xa2 /* halt machine and power down */ -#endif -#ifndef PASTE -#define PASTE 0xa3 /* paste from cut-paste buffer */ -#endif - #define SPECIAL 0x80000000 static const char ctrl_names[32][4] = {