From 3b62a89d4d72d6c647d1df17779332762fe796c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Tue, 19 Mar 2024 21:29:05 +0100 Subject: [PATCH] [BOOTVID] Don't NTAPI non-exported functions; remove useless `@implemented` (#6650) --- drivers/base/bootvid/arm/arm.h | 4 ---- drivers/base/bootvid/arm/bootvid.c | 20 -------------------- drivers/base/bootvid/common.c | 8 -------- drivers/base/bootvid/i386/pc/bootvid.c | 8 -------- drivers/base/bootvid/i386/pc/pc.h | 4 ---- drivers/base/bootvid/i386/pc/vga.c | 15 --------------- drivers/base/bootvid/i386/pc98/bootvid.c | 4 ---- drivers/base/bootvid/i386/pc98/pc98.h | 4 ---- drivers/base/bootvid/i386/xbox/bootvid.c | 4 ---- drivers/base/bootvid/i386/xbox/xbox.h | 4 ---- 10 files changed, 75 deletions(-) diff --git a/drivers/base/bootvid/arm/arm.h b/drivers/base/bootvid/arm/arm.h index 84e49a777f5..1d6fc91ac2d 100644 --- a/drivers/base/bootvid/arm/arm.h +++ b/drivers/base/bootvid/arm/arm.h @@ -46,7 +46,6 @@ VidpBuildColor( } VOID -NTAPI InitPaletteWithTable( _In_ PULONG Table, _In_ ULONG Count); @@ -68,19 +67,16 @@ SetPixel( } VOID -NTAPI PreserveRow( _In_ ULONG CurrentTop, _In_ ULONG TopDelta, _In_ BOOLEAN Restore); VOID -NTAPI DoScroll( _In_ ULONG Scroll); VOID -NTAPI DisplayCharacter( _In_ CHAR Character, _In_ ULONG Left, diff --git a/drivers/base/bootvid/arm/bootvid.c b/drivers/base/bootvid/arm/bootvid.c index d3d74f6f2fb..08bc292dfc7 100644 --- a/drivers/base/bootvid/arm/bootvid.c +++ b/drivers/base/bootvid/arm/bootvid.c @@ -16,7 +16,6 @@ PHYSICAL_ADDRESS VgaPhysical; /* PRIVATE FUNCTIONS *********************************************************/ VOID -NTAPI DisplayCharacter( _In_ CHAR Character, _In_ ULONG Left, @@ -62,7 +61,6 @@ DisplayCharacter( } VOID -NTAPI DoScroll( _In_ ULONG Scroll) { @@ -110,7 +108,6 @@ DoScroll( } VOID -NTAPI PreserveRow( _In_ ULONG CurrentTop, _In_ ULONG TopDelta, @@ -147,7 +144,6 @@ PreserveRow( } VOID -NTAPI VidpInitializeDisplay(VOID) { // @@ -173,7 +169,6 @@ VidpInitializeDisplay(VOID) } VOID -NTAPI InitPaletteWithTable( _In_ PULONG Table, _In_ ULONG Count) @@ -183,9 +178,6 @@ InitPaletteWithTable( /* PUBLIC FUNCTIONS **********************************************************/ -/* - * @implemented - */ BOOLEAN NTAPI VidInitialize( @@ -219,9 +211,6 @@ VidInitialize( return TRUE; } -/* - * @implemented - */ VOID NTAPI VidResetDisplay( @@ -245,9 +234,6 @@ VidResetDisplay( VidSolidColorFill(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, BV_COLOR_BLACK); } -/* - * @implemented - */ VOID NTAPI VidCleanUp(VOID) @@ -256,9 +242,6 @@ VidCleanUp(VOID) while (TRUE); } -/* - * @implemented - */ VOID NTAPI VidScreenToBufferBlt( @@ -273,9 +256,6 @@ VidScreenToBufferBlt( while (TRUE); } -/* - * @implemented - */ VOID NTAPI VidSolidColorFill( diff --git a/drivers/base/bootvid/common.c b/drivers/base/bootvid/common.c index e2119f84bde..9a58081a5d0 100644 --- a/drivers/base/bootvid/common.c +++ b/drivers/base/bootvid/common.c @@ -54,7 +54,6 @@ static BOOLEAN ClearRow = FALSE; /* PRIVATE FUNCTIONS **********************************************************/ static VOID -NTAPI BitBlt( _In_ ULONG Left, _In_ ULONG Top, @@ -117,7 +116,6 @@ BitBlt( } static VOID -NTAPI RleBitBlt( _In_ ULONG Left, _In_ ULONG Top, @@ -312,9 +310,6 @@ RleBitBlt( /* PUBLIC FUNCTIONS ***********************************************************/ -/* - * @implemented - */ ULONG NTAPI VidSetTextColor( @@ -375,9 +370,6 @@ VidSetScrollRegion( VidpCurrentY = Top; } -/* - * @implemented - */ VOID NTAPI VidDisplayString( diff --git a/drivers/base/bootvid/i386/pc/bootvid.c b/drivers/base/bootvid/i386/pc/bootvid.c index e847d6d7e60..f1ab0603102 100644 --- a/drivers/base/bootvid/i386/pc/bootvid.c +++ b/drivers/base/bootvid/i386/pc/bootvid.c @@ -11,7 +11,6 @@ /* PRIVATE FUNCTIONS *********************************************************/ static BOOLEAN -NTAPI VgaInterpretCmdStream( _In_ PUSHORT CmdStream) { @@ -177,7 +176,6 @@ VgaInterpretCmdStream( } static BOOLEAN -NTAPI VgaIsPresent(VOID) { UCHAR OrgGCAddr, OrgReadMap, OrgBitMask; @@ -362,9 +360,6 @@ VgaIsPresent(VOID) /* PUBLIC FUNCTIONS **********************************************************/ -/* - * @implemented - */ BOOLEAN NTAPI VidInitialize( @@ -469,9 +464,6 @@ VidInitialize( return TRUE; } -/* - * @implemented - */ VOID NTAPI VidResetDisplay( diff --git a/drivers/base/bootvid/i386/pc/pc.h b/drivers/base/bootvid/i386/pc/pc.h index e78370f95e3..814552714db 100644 --- a/drivers/base/bootvid/i386/pc/pc.h +++ b/drivers/base/bootvid/i386/pc/pc.h @@ -26,7 +26,6 @@ extern UCHAR PixelMask[8]; WRITE_PORT_USHORT((PUSHORT)(VgaRegisterBase + (Port)), (USHORT)(Value)) VOID -NTAPI InitPaletteWithTable( _In_ PULONG Table, _In_ ULONG Count); @@ -57,19 +56,16 @@ SetPixel( } VOID -NTAPI PreserveRow( _In_ ULONG CurrentTop, _In_ ULONG TopDelta, _In_ BOOLEAN Restore); VOID -NTAPI DoScroll( _In_ ULONG Scroll); VOID -NTAPI DisplayCharacter( _In_ CHAR Character, _In_ ULONG Left, diff --git a/drivers/base/bootvid/i386/pc/vga.c b/drivers/base/bootvid/i386/pc/vga.c index 7daeaa1d167..d4b54f636c3 100644 --- a/drivers/base/bootvid/i386/pc/vga.c +++ b/drivers/base/bootvid/i386/pc/vga.c @@ -71,7 +71,6 @@ ULONG_PTR VgaBase = 0; /* PRIVATE FUNCTIONS *********************************************************/ static VOID -NTAPI ReadWriteMode( _In_ UCHAR Mode) { @@ -111,7 +110,6 @@ do { \ } while (0); VOID -NTAPI DisplayCharacter( _In_ CHAR Character, _In_ ULONG Left, @@ -202,7 +200,6 @@ DisplayCharacter( } static VOID -NTAPI SetPaletteEntryRGB( _In_ ULONG Id, _In_ RGBQUAD Rgb) @@ -217,7 +214,6 @@ SetPaletteEntryRGB( } VOID -NTAPI InitPaletteWithTable( _In_ PULONG Table, _In_ ULONG Count) @@ -232,7 +228,6 @@ InitPaletteWithTable( } VOID -NTAPI DoScroll( _In_ ULONG Scroll) { @@ -272,7 +267,6 @@ DoScroll( } VOID -NTAPI PreserveRow( _In_ ULONG CurrentTop, _In_ ULONG TopDelta, @@ -323,9 +317,6 @@ PreserveRow( /* PUBLIC FUNCTIONS **********************************************************/ -/* - * @implemented - */ VOID NTAPI VidCleanUp(VOID) @@ -335,9 +326,6 @@ VidCleanUp(VOID) __outpb(VGA_BASE_IO_PORT + GRAPH_DATA_PORT, BIT_MASK_DEFAULT); } -/* - * @implemented - */ VOID NTAPI VidScreenToBufferBlt( @@ -435,9 +423,6 @@ VidScreenToBufferBlt( } } -/* - * @implemented - */ VOID NTAPI VidSolidColorFill( diff --git a/drivers/base/bootvid/i386/pc98/bootvid.c b/drivers/base/bootvid/i386/pc98/bootvid.c index bc52e3d5d2d..37c85cf4fc8 100644 --- a/drivers/base/bootvid/i386/pc98/bootvid.c +++ b/drivers/base/bootvid/i386/pc98/bootvid.c @@ -248,7 +248,6 @@ SetPaletteEntryRGB( } VOID -NTAPI InitPaletteWithTable( _In_ PULONG Table, _In_ ULONG Count) @@ -264,7 +263,6 @@ InitPaletteWithTable( } VOID -NTAPI DisplayCharacter( _In_ CHAR Character, _In_ ULONG Left, @@ -292,7 +290,6 @@ DisplayCharacter( } VOID -NTAPI PreserveRow( _In_ ULONG CurrentTop, _In_ ULONG TopDelta, @@ -325,7 +322,6 @@ PrepareForSetPixel(VOID) } VOID -NTAPI DoScroll( _In_ ULONG Scroll) { diff --git a/drivers/base/bootvid/i386/pc98/pc98.h b/drivers/base/bootvid/i386/pc98/pc98.h index 38b523d9b54..520b94b36a0 100644 --- a/drivers/base/bootvid/i386/pc98/pc98.h +++ b/drivers/base/bootvid/i386/pc98/pc98.h @@ -21,7 +21,6 @@ extern ULONG_PTR FrameBuffer; /* PROTOTYPES *****************************************************************/ VOID -NTAPI DisplayCharacter( _In_ CHAR Character, _In_ ULONG Left, @@ -30,18 +29,15 @@ DisplayCharacter( _In_ ULONG BackColor); VOID -NTAPI DoScroll( _In_ ULONG Scroll); VOID -NTAPI InitPaletteWithTable( _In_ PULONG Table, _In_ ULONG Count); VOID -NTAPI PreserveRow( _In_ ULONG CurrentTop, _In_ ULONG TopDelta, diff --git a/drivers/base/bootvid/i386/xbox/bootvid.c b/drivers/base/bootvid/i386/xbox/bootvid.c index 0d9f05cae3d..d98c49560bd 100644 --- a/drivers/base/bootvid/i386/xbox/bootvid.c +++ b/drivers/base/bootvid/i386/xbox/bootvid.c @@ -239,7 +239,6 @@ VidResetDisplay( } VOID -NTAPI InitPaletteWithTable( _In_ PULONG Table, _In_ ULONG Count) @@ -274,7 +273,6 @@ SetPixel( } VOID -NTAPI PreserveRow( _In_ ULONG CurrentTop, _In_ ULONG TopDelta, @@ -320,7 +318,6 @@ PreserveRow( } VOID -NTAPI DoScroll( _In_ ULONG Scroll) { @@ -349,7 +346,6 @@ DoScroll( } VOID -NTAPI DisplayCharacter( _In_ CHAR Character, _In_ ULONG Left, diff --git a/drivers/base/bootvid/i386/xbox/xbox.h b/drivers/base/bootvid/i386/xbox/xbox.h index c48119d322f..49e52c58e1b 100644 --- a/drivers/base/bootvid/i386/xbox/xbox.h +++ b/drivers/base/bootvid/i386/xbox/xbox.h @@ -16,7 +16,6 @@ #define FB_OFFSET(x, y) (((PanV + (y)) * FrameBufferWidth + PanH + (x)) * BytesPerPixel) VOID -NTAPI InitPaletteWithTable( _In_ PULONG Table, _In_ ULONG Count); @@ -31,19 +30,16 @@ SetPixel( _In_ UCHAR Color); VOID -NTAPI PreserveRow( _In_ ULONG CurrentTop, _In_ ULONG TopDelta, _In_ BOOLEAN Restore); VOID -NTAPI DoScroll( _In_ ULONG Scroll); VOID -NTAPI DisplayCharacter( _In_ CHAR Character, _In_ ULONG Left,