CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: yasu...@cvs.openbsd.org 2023/09/07 23:56:22 Modified files: usr.sbin/radiusd: Makefile parse.y radiusd.c radiusd.conf.5 radiusd.h radiusd_local.h radiusd_module.c radiusd_module.h Added files: usr.sbin/radiusd: radiusd_standard.c usr.sbin/radiusd/radiusd_standard: Makefile Log message: Add request or response decoration feature which is used through the radiusd module interface. This makes additional modules can modify RADIUS request or response messages. Also add new "radius_standard" module which uses this new feature, provides some generic features like "strip-atmark-realm" which removes the realm part from the User-Name attribute. from IIJ.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: d...@cvs.openbsd.org2023/09/07 23:56:13 Modified files: usr.bin/ssh: scp.c sftp-client.c sftp-client.h sftp-glob.c sftp-usergroup.c sftp.c Log message: the sftp code was one of my first contributions to OpenSSH and it shows - the function names are terrible. Rename do_blah() to sftp_blah() to make them less so. Completely mechanical except for sftp_stat() and sftp_lstat() which change from returning a pointer to a static variable (error-prone) to taking a pointer to a caller-provided receiver.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: d...@cvs.openbsd.org2023/09/07 23:50:57 Modified files: regress/usr.bin/ssh: scp.sh Log message: regress test for recursive copies of directories containing symlinks to other directories. bz3611, ok dtucker@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: d...@cvs.openbsd.org2023/09/07 23:50:12 Modified files: usr.bin/ssh: sftp-client.c Log message: fix scp in SFTP mode recursive upload and download of directories that contain symlinks to other directories. In scp mode, the links would be followed, but in SFTP mode they were not. bz3611, ok dtucker@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: yasu...@cvs.openbsd.org 2023/09/07 23:49:59 src/usr.sbin/radiusd/radiusd_standard Update of /cvs/src/usr.sbin/radiusd/radiusd_standard In directory cvs.openbsd.org:/tmp/cvs-serv14327/radiusd_standard Log Message: Directory /cvs/src/usr.sbin/radiusd/radiusd_standard added to the repository
CVS: cvs.openbsd.org: xenocara
CVSROOT:/cvs Module name:xenocara Changes by: matth...@cvs.openbsd.org2023/09/07 23:44:27 Modified files: driver/xf86-video-amdgpu/src: amdgpu_present.c drmmode_display.h xserver/glamor : glamor.h glamor_egl.c Log message: Revert previous: unbreak build with clang-16 by fixing up function definitions to match the whole CARD64 vs uint64_t issue needs more thinking. Suggested by kettenis@
CVS: cvs.openbsd.org: xenocara
CVSROOT:/cvs Module name:xenocara Changes by: matth...@cvs.openbsd.org2023/09/07 23:40:10 Modified files: proto/xorgproto/include/X11: Xmd.h Log message: Revert previous. Needs more thinking. suggested by kettenis@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: es...@cvs.openbsd.org 2023/09/07 17:32:56 Modified files: share/man/man5 : bsd.port.mk.5 Log message: blast from the past... be gone!
Re: CVS: cvs.openbsd.org: xenocara
On Thu, Sep 07, 2023 at 03:54:21PM -0600, Matthieu Herrb wrote: > CVSROOT: /cvs > Module name: xenocara > Changes by: matth...@cvs.openbsd.org2023/09/07 15:54:21 > > Modified files: > proto/xorgproto/include/X11: Xmd.h > > Log message: > Fix the build after recent CARD64 / unsigned long fises for llvm 16 > > There are many places in X drivers where CARD64 is used mixed with uint64_t > and CARD32 mixed with uint32_t. > Initially the CARD* types were only meant to be used in the X protocol > definition and implementation. Later they got used in driver for fixed- > length unsigned integers as synonyms for uintxx_t types. > Unfortunatly on OpenBSD the definition of uint64_t and CARD64 don't match. > So take the bull by the horns and fix the CARDxx definitions using the > corresponding uintxx_t types from stdint.h. > this was ok tb@ -- Matthieu Herrb
CVS: cvs.openbsd.org: xenocara
CVSROOT:/cvs Module name:xenocara Changes by: matth...@cvs.openbsd.org2023/09/07 15:54:21 Modified files: proto/xorgproto/include/X11: Xmd.h Log message: Fix the build after recent CARD64 / unsigned long fises for llvm 16 There are many places in X drivers where CARD64 is used mixed with uint64_t and CARD32 mixed with uint32_t. Initially the CARD* types were only meant to be used in the X protocol definition and implementation. Later they got used in driver for fixed- length unsigned integers as synonyms for uintxx_t types. Unfortunatly on OpenBSD the definition of uint64_t and CARD64 don't match. So take the bull by the horns and fix the CARDxx definitions using the corresponding uintxx_t types from stdint.h.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2023/09/07 15:31:00 Modified files: distrib/sets/lists/comp: mi Log message: sync
Re: CVS: cvs.openbsd.org: xenocara
On Thu, Sep 07, 2023 at 10:02:12PM +0200, Matthieu Herrb wrote:
> On Thu, Sep 07, 2023 at 05:24:56PM +0200, Matthieu Herrb wrote:
> > On Thu, Sep 07, 2023 at 07:11:40AM +0200, Anton Lindqvist wrote:
> > > On Wed, Sep 06, 2023 at 05:42:37AM -0600, Robert Nagy wrote:
> > > > CVSROOT:/cvs
> > > > Module name:xenocara
> > > > Changes by: rob...@cvs.openbsd.org 2023/09/06 05:42:37
> > > >
> > > > Modified files:
> > > > driver/xf86-video-amdgpu/src: amdgpu_present.c
> > > > drmmode_display.h
> > > > xserver/glamor : glamor.h glamor_egl.c
> > > >
> > > > Log message:
> > > > unbreak build with clang-16 by fixing up function definitions to match
> > > >
> > > > our uint64_t is an unsinged long long, but CARD64 is defined as
> > > > unsigned long
> > > > so the function pointer types in both glamor and xf86-video-amdgpu were
> > > > mismatched and clang-16 treats that as an error
> > > >
> > > > ok matthieu@
> > >
> > > This broke the tree. Here's a potential fix.
> >
> > Hmm no, this one reverts parts of the llvm 16 diffs.
> >
> > What about this that gets rid of CARD64 completely in this context ?
> >
> > hint for the X developpers: CARD64 and friends are normally reserved
> > for the X protocol specification and implementation
> >
> > All other uses as cheap substites for uint64_t or similar are just
> > historical artefacts from an era where there was no standard integer
> > types with known fixed lengths.
>
> This is still not enough.
>
> I've deciced to cure the problem at its root.
>
> Whith this patch, the tree builds with both base llvm and llvm 16 on
> amd64. I've started a build i386 to double check 32 bit arches.
>
> And it will allow to revert some other patches to reduce the number of
> local changes. I also think that it has some chances to be accepted
> upstreams.
>
> basically just define the CARDnn types in terms on uint_nn everywhere.
> Like for signal.h all systems still supported by X have stdint and the
> uintnn_t types.
>
If this builds please land it.
>
> Index: proto/xorgproto/include/X11/Xmd.h
> ===
> RCS file: /local/cvs/xenocara/proto/xorgproto/include/X11/Xmd.h,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 Xmd.h
> --- proto/xorgproto/include/X11/Xmd.h 11 Nov 2021 08:55:42 - 1.2
> +++ proto/xorgproto/include/X11/Xmd.h 7 Sep 2023 16:20:01 -
> @@ -57,6 +57,8 @@ SOFTWARE.
> # include /* Solaris: defines _LP64 if necessary */
> # endif
>
> +#include
> +
> #if defined(__SIZEOF_LONG__)
> # if __SIZEOF_LONG__ == 8
> # define LONG64 /* 32/64-bit architecture */
> @@ -107,15 +109,10 @@ typedef short INT16;
>
> typedef signed charINT8;
>
> -# ifdef LONG64
> -typedef unsigned long CARD64;
> -typedef unsigned int CARD32;
> -# else
> -typedef unsigned long long CARD64;
> -typedef unsigned long CARD32;
> -# endif
> -typedef unsigned short CARD16;
> -typedef unsigned char CARD8;
> +typedef uint64_t CARD64;
> +typedef uint32_t CARD32;
> +typedef uint16_t CARD16;
> +typedef uint8_t CARD8;
>
> typedef CARD32 BITS32;
> typedef CARD16 BITS16;
>
> >
> > Index: src/drmmode_display.c
> > ===
> > RCS file:
> > /local/cvs/xenocara/driver/xf86-video-amdgpu/src/drmmode_display.c,v
> > retrieving revision 1.4
> > diff -u -p -u -r1.4 drmmode_display.c
> > --- src/drmmode_display.c 5 Dec 2022 16:41:17 - 1.4
> > +++ src/drmmode_display.c 7 Sep 2023 15:20:36 -
> > @@ -197,7 +197,7 @@ drmmode_wait_vblank(xf86CrtcPtr crtc, dr
> > * version and DRM kernel module configuration, the vblank
> > * timestamp can either be in real time or monotonic time
> > */
> > -int drmmode_get_current_ust(int drm_fd, CARD64 * ust)
> > +int drmmode_get_current_ust(int drm_fd, uint64_t * ust)
> > {
> > uint64_t cap_value;
> > int ret;
> > @@ -211,14 +211,14 @@ int drmmode_get_current_ust(int drm_fd,
> > ret = clock_gettime(CLOCK_MONOTONIC, );
> > if (ret)
> > return ret;
> > - *ust = ((CARD64) now.tv_sec * 100) + ((CARD64) now.tv_nsec / 1000);
> > + *ust = ((uint64_t) now.tv_sec * 100) + ((uint64_t) now.tv_nsec /
> > 1000);
> > return 0;
> > }
> >
> > /*
> > * Get current frame count and frame count timestamp of the crtc.
> > */
> > -int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc)
> > +int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, uint64_t *ust, uint64_t
> > *msc)
> > {
> > ScrnInfoPtr scrn = crtc->scrn;
> > uint32_t seq;
> > @@ -303,7 +303,7 @@ drmmode_do_crtc_dpms(xf86CrtcPtr crtc, i
> > drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
> > ScrnInfoPtr scrn = crtc->scrn;
> > AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(scrn);
> > - CARD64 ust;
> > + uint64_t ust;
> > int ret;
> >
> > if
Re: CVS: cvs.openbsd.org: xenocara
On Thu, Sep 07, 2023 at 05:24:56PM +0200, Matthieu Herrb wrote:
> On Thu, Sep 07, 2023 at 07:11:40AM +0200, Anton Lindqvist wrote:
> > On Wed, Sep 06, 2023 at 05:42:37AM -0600, Robert Nagy wrote:
> > > CVSROOT: /cvs
> > > Module name: xenocara
> > > Changes by: rob...@cvs.openbsd.org 2023/09/06 05:42:37
> > >
> > > Modified files:
> > > driver/xf86-video-amdgpu/src: amdgpu_present.c drmmode_display.h
> > > xserver/glamor : glamor.h glamor_egl.c
> > >
> > > Log message:
> > > unbreak build with clang-16 by fixing up function definitions to match
> > >
> > > our uint64_t is an unsinged long long, but CARD64 is defined as unsigned
> > > long
> > > so the function pointer types in both glamor and xf86-video-amdgpu were
> > > mismatched and clang-16 treats that as an error
> > >
> > > ok matthieu@
> >
> > This broke the tree. Here's a potential fix.
>
> Hmm no, this one reverts parts of the llvm 16 diffs.
>
> What about this that gets rid of CARD64 completely in this context ?
>
> hint for the X developpers: CARD64 and friends are normally reserved
> for the X protocol specification and implementation
>
> All other uses as cheap substites for uint64_t or similar are just
> historical artefacts from an era where there was no standard integer
> types with known fixed lengths.
This is still not enough.
I've deciced to cure the problem at its root.
Whith this patch, the tree builds with both base llvm and llvm 16 on
amd64. I've started a build i386 to double check 32 bit arches.
And it will allow to revert some other patches to reduce the number of
local changes. I also think that it has some chances to be accepted
upstreams.
basically just define the CARDnn types in terms on uint_nn everywhere.
Like for signal.h all systems still supported by X have stdint and the
uintnn_t types.
Index: proto/xorgproto/include/X11/Xmd.h
===
RCS file: /local/cvs/xenocara/proto/xorgproto/include/X11/Xmd.h,v
retrieving revision 1.2
diff -u -p -u -r1.2 Xmd.h
--- proto/xorgproto/include/X11/Xmd.h 11 Nov 2021 08:55:42 - 1.2
+++ proto/xorgproto/include/X11/Xmd.h 7 Sep 2023 16:20:01 -
@@ -57,6 +57,8 @@ SOFTWARE.
# include /* Solaris: defines _LP64 if necessary */
# endif
+#include
+
#if defined(__SIZEOF_LONG__)
# if __SIZEOF_LONG__ == 8
# define LONG64 /* 32/64-bit architecture */
@@ -107,15 +109,10 @@ typedef short INT16;
typedef signed charINT8;
-# ifdef LONG64
-typedef unsigned long CARD64;
-typedef unsigned int CARD32;
-# else
-typedef unsigned long long CARD64;
-typedef unsigned long CARD32;
-# endif
-typedef unsigned short CARD16;
-typedef unsigned char CARD8;
+typedef uint64_t CARD64;
+typedef uint32_t CARD32;
+typedef uint16_t CARD16;
+typedef uint8_t CARD8;
typedef CARD32 BITS32;
typedef CARD16 BITS16;
>
> Index: src/drmmode_display.c
> ===
> RCS file: /local/cvs/xenocara/driver/xf86-video-amdgpu/src/drmmode_display.c,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 drmmode_display.c
> --- src/drmmode_display.c 5 Dec 2022 16:41:17 - 1.4
> +++ src/drmmode_display.c 7 Sep 2023 15:20:36 -
> @@ -197,7 +197,7 @@ drmmode_wait_vblank(xf86CrtcPtr crtc, dr
> * version and DRM kernel module configuration, the vblank
> * timestamp can either be in real time or monotonic time
> */
> -int drmmode_get_current_ust(int drm_fd, CARD64 * ust)
> +int drmmode_get_current_ust(int drm_fd, uint64_t * ust)
> {
> uint64_t cap_value;
> int ret;
> @@ -211,14 +211,14 @@ int drmmode_get_current_ust(int drm_fd,
> ret = clock_gettime(CLOCK_MONOTONIC, );
> if (ret)
> return ret;
> - *ust = ((CARD64) now.tv_sec * 100) + ((CARD64) now.tv_nsec / 1000);
> + *ust = ((uint64_t) now.tv_sec * 100) + ((uint64_t) now.tv_nsec /
> 1000);
> return 0;
> }
>
> /*
> * Get current frame count and frame count timestamp of the crtc.
> */
> -int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc)
> +int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, uint64_t *ust, uint64_t *msc)
> {
> ScrnInfoPtr scrn = crtc->scrn;
> uint32_t seq;
> @@ -303,7 +303,7 @@ drmmode_do_crtc_dpms(xf86CrtcPtr crtc, i
> drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
> ScrnInfoPtr scrn = crtc->scrn;
> AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(scrn);
> - CARD64 ust;
> + uint64_t ust;
> int ret;
>
> if (drmmode_crtc->dpms_mode == DPMSModeOn && mode != DPMSModeOn) {
> @@ -321,7 +321,7 @@ drmmode_do_crtc_dpms(xf86CrtcPtr crtc, i
> "%s cannot get last vblank counter\n",
> __func__);
> else {
> - CARD64 nominal_frame_rate, pix_in_frame;
> + uint64_t
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: schwa...@cvs.openbsd.org2023/09/07 13:59:58 Modified files: lib/libcrypto/man: EVP_DigestInit.3 Log message: Below RETURN VALUES, * mention that EVP_MD_CTX_md(3) also returns NULL if no message digest is configured yet; and * omplete the list of functions returning const EVP_MD *, also making the wording more precise. Delete EVP_MAX_MD_SIZE from the NAME, SYNOPSIS, and HISTORY sections because we do not usually document preprocessor macro constants in this way. There is nothing special about this constant justifying an exception.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: schwa...@cvs.openbsd.org2023/09/07 13:28:37 Modified files: lib/libcrypto/man: EVP_MD_CTX_ctrl.3 Log message: add the missing entries for EVP_MD_CTX_pkey_ctx(3) and EVP_MD_CTX_md_data(3) to the RETURN VALUES section
Re: CVS: cvs.openbsd.org: xenocara
On Thu, Sep 07, 2023 at 05:24:35PM +0200, Matthieu Herrb wrote: > On Thu, Sep 07, 2023 at 07:11:40AM +0200, Anton Lindqvist wrote: > > On Wed, Sep 06, 2023 at 05:42:37AM -0600, Robert Nagy wrote: > > > CVSROOT: /cvs > > > Module name: xenocara > > > Changes by: rob...@cvs.openbsd.org 2023/09/06 05:42:37 > > > > > > Modified files: > > > driver/xf86-video-amdgpu/src: amdgpu_present.c drmmode_display.h > > > xserver/glamor : glamor.h glamor_egl.c > > > > > > Log message: > > > unbreak build with clang-16 by fixing up function definitions to match > > > > > > our uint64_t is an unsinged long long, but CARD64 is defined as unsigned > > > long > > > so the function pointer types in both glamor and xf86-video-amdgpu were > > > mismatched and clang-16 treats that as an error > > > > > > ok matthieu@ > > > > This broke the tree. Here's a potential fix. > > Hmm no, this one reverts parts of the llvm 16 diffs. > > What about this that gets rid of CARD64 completely in this context ? > > hint for the X developpers: CARD64 and friends are normally reserved > for the X protocol specification and implementation > > All other uses as cheap substites for uint64_t or similar are just > historical artefacts from an era where there was no standard integer > types with known fixed lengths. ok anton@ fwiw
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: es...@cvs.openbsd.org 2023/09/07 11:26:14 Modified files: share/man/man5 : bsd.port.mk.5 Log message: always say "the sqlports package"
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: es...@cvs.openbsd.org 2023/09/07 11:24:39 Modified files: share/man/man5 : bsd.port.mk.5 Log message: be more direct about SUPDISTFILES
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: es...@cvs.openbsd.org 2023/09/07 11:21:10 Modified files: share/man/man5 : bsd.port.mk.5 Log message: We prefer SITES.sufx (lowercase)
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: es...@cvs.openbsd.org 2023/09/07 11:19:19 Modified files: share/man/man7 : ports.7 Log message: MASTER_SITES -> SITES
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: es...@cvs.openbsd.org 2023/09/07 11:17:43 Modified files: share/man/man5 : bsd.port.mk.5 Log message: mention that SITE_BACKUP won't work transparently until we completely get rid of MASTER_SITES.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: es...@cvs.openbsd.org 2023/09/07 11:15:29 Modified files: share/man/man5 : bsd.port.mk.5 Log message: beyond libtool
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: schwa...@cvs.openbsd.org2023/09/07 10:32:41 Modified files: lib/libcrypto/man: EVP_MD_nid.3 Log message: document EVP_MD_nid(3) and EVP_MD_name(3)
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: schwa...@cvs.openbsd.org2023/09/07 09:57:04 Modified files: lib/libcrypto/man: EVP_MD_nid.3 Log message: improve the descriptions of most functions
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: es...@cvs.openbsd.org 2023/09/07 09:28:48 Modified files: share/man/man5 : bsd.port.mk.5 Log message: default value for PORTHOME (todo: add it as diagnostic)
Re: CVS: cvs.openbsd.org: xenocara
On Thu, Sep 07, 2023 at 07:11:40AM +0200, Anton Lindqvist wrote:
> On Wed, Sep 06, 2023 at 05:42:37AM -0600, Robert Nagy wrote:
> > CVSROOT:/cvs
> > Module name:xenocara
> > Changes by: rob...@cvs.openbsd.org 2023/09/06 05:42:37
> >
> > Modified files:
> > driver/xf86-video-amdgpu/src: amdgpu_present.c drmmode_display.h
> > xserver/glamor : glamor.h glamor_egl.c
> >
> > Log message:
> > unbreak build with clang-16 by fixing up function definitions to match
> >
> > our uint64_t is an unsinged long long, but CARD64 is defined as unsigned
> > long
> > so the function pointer types in both glamor and xf86-video-amdgpu were
> > mismatched and clang-16 treats that as an error
> >
> > ok matthieu@
>
> This broke the tree. Here's a potential fix.
Hmm no, this one reverts parts of the llvm 16 diffs.
What about this that gets rid of CARD64 completely in this context ?
hint for the X developpers: CARD64 and friends are normally reserved
for the X protocol specification and implementation
All other uses as cheap substites for uint64_t or similar are just
historical artefacts from an era where there was no standard integer
types with known fixed lengths.
Index: src/drmmode_display.c
===
RCS file: /local/cvs/xenocara/driver/xf86-video-amdgpu/src/drmmode_display.c,v
retrieving revision 1.4
diff -u -p -u -r1.4 drmmode_display.c
--- src/drmmode_display.c 5 Dec 2022 16:41:17 - 1.4
+++ src/drmmode_display.c 7 Sep 2023 15:20:36 -
@@ -197,7 +197,7 @@ drmmode_wait_vblank(xf86CrtcPtr crtc, dr
* version and DRM kernel module configuration, the vblank
* timestamp can either be in real time or monotonic time
*/
-int drmmode_get_current_ust(int drm_fd, CARD64 * ust)
+int drmmode_get_current_ust(int drm_fd, uint64_t * ust)
{
uint64_t cap_value;
int ret;
@@ -211,14 +211,14 @@ int drmmode_get_current_ust(int drm_fd,
ret = clock_gettime(CLOCK_MONOTONIC, );
if (ret)
return ret;
- *ust = ((CARD64) now.tv_sec * 100) + ((CARD64) now.tv_nsec / 1000);
+ *ust = ((uint64_t) now.tv_sec * 100) + ((uint64_t) now.tv_nsec /
1000);
return 0;
}
/*
* Get current frame count and frame count timestamp of the crtc.
*/
-int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc)
+int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, uint64_t *ust, uint64_t *msc)
{
ScrnInfoPtr scrn = crtc->scrn;
uint32_t seq;
@@ -303,7 +303,7 @@ drmmode_do_crtc_dpms(xf86CrtcPtr crtc, i
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
ScrnInfoPtr scrn = crtc->scrn;
AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(scrn);
- CARD64 ust;
+ uint64_t ust;
int ret;
if (drmmode_crtc->dpms_mode == DPMSModeOn && mode != DPMSModeOn) {
@@ -321,7 +321,7 @@ drmmode_do_crtc_dpms(xf86CrtcPtr crtc, i
"%s cannot get last vblank counter\n",
__func__);
else {
- CARD64 nominal_frame_rate, pix_in_frame;
+ uint64_t nominal_frame_rate, pix_in_frame;
drmmode_crtc->dpms_last_ust = ust;
drmmode_crtc->dpms_last_seq = seq;
@@ -347,7 +347,7 @@ drmmode_do_crtc_dpms(xf86CrtcPtr crtc, i
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"%s cannot get current time\n", __func__);
else if (drmmode_crtc->dpms_last_ust) {
- CARD64 time_elapsed, delta_seq;
+ uint64_t time_elapsed, delta_seq;
time_elapsed = ust - drmmode_crtc->dpms_last_ust;
delta_seq = time_elapsed * drmmode_crtc->dpms_last_fps;
delta_seq /= 100;
Index: src/drmmode_display.h
===
RCS file: /local/cvs/xenocara/driver/xf86-video-amdgpu/src/drmmode_display.h,v
retrieving revision 1.5
diff -u -p -u -r1.5 drmmode_display.h
--- src/drmmode_display.h 6 Sep 2023 11:42:37 - 1.5
+++ src/drmmode_display.h 7 Sep 2023 15:20:36 -
@@ -127,7 +127,7 @@ typedef struct {
PixmapPtr prime_scanout_pixmap;
int dpms_mode;
- CARD64 dpms_last_ust;
+ uint64_t dpms_last_ust;
uint32_t dpms_last_seq;
int dpms_last_fps;
uint32_t interpolated_vblanks;
@@ -285,7 +285,7 @@ Bool amdgpu_do_pageflip(ScrnInfoPtr scrn
enum drmmode_flip_sync flip_sync,
uint32_t target_msc);
int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, uint64_t *ust, uint64_t *msc);
-int drmmode_get_current_ust(int drm_fd, CARD64 * ust);
+int drmmode_get_current_ust(int drm_fd, uint64_t * ust);
void drmmode_crtc_set_vrr(xf86CrtcPtr crtc, Bool enabled);
Bool
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: es...@cvs.openbsd.org 2023/09/07 09:23:00 Modified files: share/man/man5 : bsd.port.mk.5 Log message: don't share patches lightly
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: es...@cvs.openbsd.org 2023/09/07 09:12:38 Modified files: share/man/man5 : bsd.port.mk.5 Log message: even though it's annotated, users don't see .Cm, so note we're talking about the target since 'package' is used all over the place.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: schwa...@cvs.openbsd.org2023/09/07 08:22:11 Modified files: lib/libcrypto/man: Makefile EVP_DigestInit.3 evp.3 Added files: lib/libcrypto/man: EVP_MD_CTX_ctrl.3 EVP_MD_nid.3 Log message: Split two new manual pages EVP_MD_nid(3) and EVP_MD_CTX_ctrl(3) out of the large EVP_DigestInit(3). No text change.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: to...@cvs.openbsd.org 2023/09/07 05:17:32 Modified files: usr.bin/vi/vi : v_paragraph.c Log message: Treat consecutive paragraph indicators as different paragraphs Consecutive empty lines count toward the same state, so there're 2x states (to get in and out). ^L and .PP are counted as text, hitting those in the text should be treated as getting out of a paragraph and then getting in. >From Walter Alejandro Iglesias and Zhihao Yuan in nvi2 ok bluhm@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: n...@cvs.openbsd.org2023/09/07 04:21:46 Modified files: usr.bin/tmux : tty-keys.c Log message: Use DECSLRM and DECFRA on terminals pretending to be VT520 or VT525 as well as VT420.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: sas...@cvs.openbsd.org 2023/09/07 03:59:43 Modified files: sys/net: pf.c Log message: pf(4) ignores 'keep state' and 'nat-to' actions for unsolicited icmp error responses. Fix tightens rule matching logic so icmp error responses no longer match 'keep state' rule. In typical scenarios icmp errors (if solicited) should match existing state. The change is going to bite firewalls which deal with asymmetric routes. In those cases the 'keep state' action should be relaxed to sloppy or new 'no state' rule to explicitly match icmp errors should be added. The issue has been reported by Peter J. Philip (pjp _at_ delphinusdns.org). Discussed with bluhm@ and florian@ OK bluhm@
CVS: cvs.openbsd.org: xenocara
CVSROOT:/cvs Module name:xenocara Changes by: rob...@cvs.openbsd.org 2023/09/07 03:13:51 Modified files: driver/xf86-input-usbtablet/src: usbtablet.c Log message: unbreak build with clang-16 by not using non-existent functions and by using correct types where needed; this also removes some unnecessary casts and some ancient compat defines parts from and ok jsg@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: n...@cvs.openbsd.org2023/09/07 01:19:21 Modified files: usr.bin/tmux : tty-keys.c Log message: Accept 65 for VT525 as well.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: j...@cvs.openbsd.org2023/09/07 00:32:24 Modified files: lib/libm/src : w_drem.c Log message: convert to ansi function decl
