From owner-dev-commits-src-main@freebsd.org Thu Sep 2 19:35:54 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 52DCD665172; Thu, 2 Sep 2021 19:35:54 +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 4H0rkf1W9Bz4kTd; Thu, 2 Sep 2021 19:35:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 174EF1E96B; Thu, 2 Sep 2021 19:35:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 182JZs9b064141; Thu, 2 Sep 2021 19:35:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 182JZswS064140; Thu, 2 Sep 2021 19:35:54 GMT (envelope-from git) Date: Thu, 2 Sep 2021 19:35:54 GMT Message-Id: <202109021935.182JZswS064140@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 35bc295b30ef - main - evdev: Do not export multitouch functions which are unused outside evdev MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35bc295b30ef91f1835a0ee0225e8d957a9ebddd Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Sep 2021 19:35:54 -0000 The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=35bc295b30ef91f1835a0ee0225e8d957a9ebddd commit 35bc295b30ef91f1835a0ee0225e8d957a9ebddd Author: Vladimir Kondratyev AuthorDate: 2021-09-02 19:28:34 +0000 Commit: Vladimir Kondratyev CommitDate: 2021-09-02 19:35:26 +0000 evdev: Do not export multitouch functions which are unused outside evdev --- sys/dev/evdev/evdev.h | 9 +-------- sys/dev/evdev/evdev_mt.c | 18 +++++------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/sys/dev/evdev/evdev.h b/sys/dev/evdev/evdev.h index dde9bba9b1e2..589bd7cfe563 100644 --- a/sys/dev/evdev/evdev.h +++ b/sys/dev/evdev/evdev.h @@ -156,19 +156,12 @@ void evdev_set_flag(struct evdev_dev *, uint16_t); void *evdev_get_softc(struct evdev_dev *); /* Multitouch related functions: */ -int evdev_get_mt_slot_by_tracking_id(struct evdev_dev *, int32_t); -void evdev_support_mt_compat(struct evdev_dev *); -void evdev_push_mt_compat(struct evdev_dev *); +int evdev_mt_id_to_slot(struct evdev_dev *, int32_t); int evdev_mt_push_slot(struct evdev_dev *, int, union evdev_mt_slot *); int evdev_mt_push_frame(struct evdev_dev *, union evdev_mt_slot *, int); void evdev_mt_match_frame(struct evdev_dev *, union evdev_mt_slot *, int); union evdev_mt_slot *evdev_mt_get_match_slots(struct evdev_dev *); void evdev_mt_push_autorel(struct evdev_dev *); -static inline int -evdev_mt_id_to_slot(struct evdev_dev *evdev, int32_t id) -{ - return (evdev_get_mt_slot_by_tracking_id(evdev, id)); -} /* Utility functions: */ uint16_t evdev_hid2key(int); diff --git a/sys/dev/evdev/evdev_mt.c b/sys/dev/evdev/evdev_mt.c index 3030a60e098a..a3cb76cbbdb4 100644 --- a/sys/dev/evdev/evdev_mt.c +++ b/sys/dev/evdev/evdev_mt.c @@ -93,6 +93,7 @@ struct evdev_mt { union evdev_mt_slot slots[]; }; +static void evdev_mt_support_st_compat(struct evdev_dev *); static void evdev_mt_send_st_compat(struct evdev_dev *); static void evdev_mt_send_autorel(struct evdev_dev *); static void evdev_mt_replay_events(struct evdev_dev *); @@ -144,7 +145,7 @@ evdev_mt_init(struct evdev_dev *evdev) evdev_support_abs(evdev, ABS_MT_TRACKING_ID, -1, UINT16_MAX, 0, 0, 0); if (bit_test(evdev->ev_flags, EVDEV_FLAG_MT_STCOMPAT)) - evdev_support_mt_compat(evdev); + evdev_mt_support_st_compat(evdev); } void @@ -517,7 +518,7 @@ evdev_mt_set_value(struct evdev_dev *evdev, int slot, int16_t code, } int -evdev_get_mt_slot_by_tracking_id(struct evdev_dev *evdev, int32_t tracking_id) +evdev_mt_id_to_slot(struct evdev_dev *evdev, int32_t tracking_id) { struct evdev_mt *mt = evdev->ev_mt; int slot; @@ -579,8 +580,8 @@ evdev_mt_normalize(int32_t value, int32_t mtmin, int32_t mtmax, int32_t stmax) return (value); } -void -evdev_support_mt_compat(struct evdev_dev *evdev) +static void +evdev_mt_support_st_compat(struct evdev_dev *evdev) { struct input_absinfo *ai; int i; @@ -650,15 +651,6 @@ evdev_mt_send_st_compat(struct evdev_dev *evdev) evdev_send_event(evdev, EV_ABS, ABS_PRESSURE, 0); } -void -evdev_push_mt_compat(struct evdev_dev *evdev) -{ - - EVDEV_ENTER(evdev); - evdev_mt_send_st_compat(evdev); - EVDEV_EXIT(evdev); -} - static void evdev_mt_send_autorel(struct evdev_dev *evdev) {