summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-02-04 22:26:44 -0500
committerGravatar bunnei2018-02-04 22:26:44 -0500
commit8a5833f7ad757f3c9c9051632aa05c99ca4543fa (patch)
treea6a0163dde6a08ddbf506a23c2562ea4357426bc /src
parenthid: Stub out several functions. (diff)
downloadyuzu-8a5833f7ad757f3c9c9051632aa05c99ca4543fa.tar.gz
yuzu-8a5833f7ad757f3c9c9051632aa05c99ca4543fa.tar.xz
yuzu-8a5833f7ad757f3c9c9051632aa05c99ca4543fa.zip
logger: Add VI service logging category.
Diffstat (limited to 'src')
-rw-r--r--src/common/logging/backend.cpp1
-rw-r--r--src/common/logging/log.h1
-rw-r--r--src/core/hle/service/vi/vi.cpp35
-rw-r--r--src/core/hle/service/vi/vi_m.cpp2
-rw-r--r--src/core/hle/service/vi/vi_s.cpp2
-rw-r--r--src/core/hle/service/vi/vi_u.cpp2
6 files changed, 22 insertions, 21 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 4a1397b7b..7d7291612 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -42,6 +42,7 @@ namespace Log {
42 SUB(Service, HID) \ 42 SUB(Service, HID) \
43 SUB(Service, NVDRV) \ 43 SUB(Service, NVDRV) \
44 SUB(Service, Audio) \ 44 SUB(Service, Audio) \
45 SUB(Service, VI) \
45 CLS(HW) \ 46 CLS(HW) \
46 SUB(HW, Memory) \ 47 SUB(HW, Memory) \
47 SUB(HW, LCD) \ 48 SUB(HW, LCD) \
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index 72e4f2ef7..76cee71cb 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -59,6 +59,7 @@ enum class Class : ClassType {
59 Service_HID, ///< The HID (Human interface device) service 59 Service_HID, ///< The HID (Human interface device) service
60 Service_NVDRV, ///< The NVDRV (Nvidia driver) service 60 Service_NVDRV, ///< The NVDRV (Nvidia driver) service
61 Service_Audio, ///< The Audio (Audio control) service 61 Service_Audio, ///< The Audio (Audio control) service
62 Service_VI, ///< The VI (Video interface) service
62 HW, ///< Low-level hardware emulation 63 HW, ///< Low-level hardware emulation
63 HW_Memory, ///< Memory-map and address translation 64 HW_Memory, ///< Memory-map and address translation
64 HW_LCD, ///< LCD register emulation 65 HW_LCD, ///< LCD register emulation
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp
index 2c7737fd9..adefba2b7 100644
--- a/src/core/hle/service/vi/vi.cpp
+++ b/src/core/hle/service/vi/vi.cpp
@@ -429,7 +429,7 @@ private:
429 auto& output_buffer = ctx.BufferDescriptorB()[0]; 429 auto& output_buffer = ctx.BufferDescriptorB()[0];
430 430
431 auto buffer_queue = nv_flinger->GetBufferQueue(id); 431 auto buffer_queue = nv_flinger->GetBufferQueue(id);
432 432 LOG_WARNING(Service_VI, "(STUBBED) called, transaction=%x", transaction);
433 if (transaction == TransactionId::Connect) { 433 if (transaction == TransactionId::Connect) {
434 IGBPConnectRequestParcel request{input_data}; 434 IGBPConnectRequestParcel request{input_data};
435 IGBPConnectResponseParcel response{1280, 720}; 435 IGBPConnectResponseParcel response{1280, 720};
@@ -487,7 +487,6 @@ private:
487 ASSERT_MSG(false, "Unimplemented"); 487 ASSERT_MSG(false, "Unimplemented");
488 } 488 }
489 489
490 LOG_WARNING(Service, "(STUBBED) called");
491 IPC::ResponseBuilder rb{ctx, 2}; 490 IPC::ResponseBuilder rb{ctx, 2};
492 rb.Push(RESULT_SUCCESS); 491 rb.Push(RESULT_SUCCESS);
493 } 492 }
@@ -498,7 +497,7 @@ private:
498 s32 addval = rp.PopRaw<s32>(); 497 s32 addval = rp.PopRaw<s32>();
499 u32 type = rp.Pop<u32>(); 498 u32 type = rp.Pop<u32>();
500 499
501 LOG_WARNING(Service, "(STUBBED) called id=%u, addval=%08X, type=%08X", id, addval, type); 500 LOG_WARNING(Service_VI, "(STUBBED) called id=%u, addval=%08X, type=%08X", id, addval, type);
502 IPC::ResponseBuilder rb{ctx, 2}; 501 IPC::ResponseBuilder rb{ctx, 2};
503 rb.Push(RESULT_SUCCESS); 502 rb.Push(RESULT_SUCCESS);
504 } 503 }
@@ -512,7 +511,7 @@ private:
512 511
513 // TODO(Subv): Find out what this actually is. 512 // TODO(Subv): Find out what this actually is.
514 513
515 LOG_WARNING(Service, "(STUBBED) called id=%u, unknown=%08X", id, unknown); 514 LOG_WARNING(Service_VI, "(STUBBED) called id=%u, unknown=%08X", id, unknown);
516 IPC::ResponseBuilder rb{ctx, 2, 1}; 515 IPC::ResponseBuilder rb{ctx, 2, 1};
517 rb.Push(RESULT_SUCCESS); 516 rb.Push(RESULT_SUCCESS);
518 rb.PushCopyObjects(buffer_queue->GetNativeHandle()); 517 rb.PushCopyObjects(buffer_queue->GetNativeHandle());
@@ -534,7 +533,7 @@ public:
534 533
535private: 534private:
536 void SetLayerZ(Kernel::HLERequestContext& ctx) { 535 void SetLayerZ(Kernel::HLERequestContext& ctx) {
537 LOG_WARNING(Service, "(STUBBED) called"); 536 LOG_WARNING(Service_VI, "(STUBBED) called");
538 IPC::RequestParser rp{ctx}; 537 IPC::RequestParser rp{ctx};
539 u64 layer_id = rp.Pop<u64>(); 538 u64 layer_id = rp.Pop<u64>();
540 u64 z_value = rp.Pop<u64>(); 539 u64 z_value = rp.Pop<u64>();
@@ -560,7 +559,7 @@ public:
560 559
561private: 560private:
562 void CloseDisplay(Kernel::HLERequestContext& ctx) { 561 void CloseDisplay(Kernel::HLERequestContext& ctx) {
563 LOG_WARNING(Service, "(STUBBED) called"); 562 LOG_WARNING(Service_VI, "(STUBBED) called");
564 IPC::RequestParser rp{ctx}; 563 IPC::RequestParser rp{ctx};
565 u64 display = rp.Pop<u64>(); 564 u64 display = rp.Pop<u64>();
566 565
@@ -569,7 +568,7 @@ private:
569 } 568 }
570 569
571 void CreateManagedLayer(Kernel::HLERequestContext& ctx) { 570 void CreateManagedLayer(Kernel::HLERequestContext& ctx) {
572 LOG_WARNING(Service, "(STUBBED) called"); 571 LOG_WARNING(Service_VI, "(STUBBED) called");
573 IPC::RequestParser rp{ctx}; 572 IPC::RequestParser rp{ctx};
574 u32 unknown = rp.Pop<u32>(); 573 u32 unknown = rp.Pop<u32>();
575 rp.Skip(1, false); 574 rp.Skip(1, false);
@@ -584,7 +583,7 @@ private:
584 } 583 }
585 584
586 void AddToLayerStack(Kernel::HLERequestContext& ctx) { 585 void AddToLayerStack(Kernel::HLERequestContext& ctx) {
587 LOG_WARNING(Service, "(STUBBED) called"); 586 LOG_WARNING(Service_VI, "(STUBBED) called");
588 IPC::RequestParser rp{ctx}; 587 IPC::RequestParser rp{ctx};
589 u32 stack = rp.Pop<u32>(); 588 u32 stack = rp.Pop<u32>();
590 u64 layer_id = rp.Pop<u64>(); 589 u64 layer_id = rp.Pop<u64>();
@@ -597,7 +596,7 @@ private:
597}; 596};
598 597
599void IApplicationDisplayService::GetRelayService(Kernel::HLERequestContext& ctx) { 598void IApplicationDisplayService::GetRelayService(Kernel::HLERequestContext& ctx) {
600 LOG_WARNING(Service, "(STUBBED) called"); 599 LOG_WARNING(Service_VI, "(STUBBED) called");
601 600
602 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 601 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
603 rb.Push(RESULT_SUCCESS); 602 rb.Push(RESULT_SUCCESS);
@@ -605,7 +604,7 @@ void IApplicationDisplayService::GetRelayService(Kernel::HLERequestContext& ctx)
605} 604}
606 605
607void IApplicationDisplayService::GetSystemDisplayService(Kernel::HLERequestContext& ctx) { 606void IApplicationDisplayService::GetSystemDisplayService(Kernel::HLERequestContext& ctx) {
608 LOG_WARNING(Service, "(STUBBED) called"); 607 LOG_WARNING(Service_VI, "(STUBBED) called");
609 608
610 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 609 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
611 rb.Push(RESULT_SUCCESS); 610 rb.Push(RESULT_SUCCESS);
@@ -613,7 +612,7 @@ void IApplicationDisplayService::GetSystemDisplayService(Kernel::HLERequestConte
613} 612}
614 613
615void IApplicationDisplayService::GetManagerDisplayService(Kernel::HLERequestContext& ctx) { 614void IApplicationDisplayService::GetManagerDisplayService(Kernel::HLERequestContext& ctx) {
616 LOG_WARNING(Service, "(STUBBED) called"); 615 LOG_WARNING(Service_VI, "(STUBBED) called");
617 616
618 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 617 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
619 rb.Push(RESULT_SUCCESS); 618 rb.Push(RESULT_SUCCESS);
@@ -622,7 +621,7 @@ void IApplicationDisplayService::GetManagerDisplayService(Kernel::HLERequestCont
622 621
623void IApplicationDisplayService::GetIndirectDisplayTransactionService( 622void IApplicationDisplayService::GetIndirectDisplayTransactionService(
624 Kernel::HLERequestContext& ctx) { 623 Kernel::HLERequestContext& ctx) {
625 LOG_WARNING(Service, "(STUBBED) called"); 624 LOG_WARNING(Service_VI, "(STUBBED) called");
626 625
627 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 626 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
628 rb.Push(RESULT_SUCCESS); 627 rb.Push(RESULT_SUCCESS);
@@ -630,7 +629,7 @@ void IApplicationDisplayService::GetIndirectDisplayTransactionService(
630} 629}
631 630
632void IApplicationDisplayService::OpenDisplay(Kernel::HLERequestContext& ctx) { 631void IApplicationDisplayService::OpenDisplay(Kernel::HLERequestContext& ctx) {
633 LOG_WARNING(Service, "(STUBBED) called"); 632 LOG_WARNING(Service_VI, "(STUBBED) called");
634 IPC::RequestParser rp{ctx}; 633 IPC::RequestParser rp{ctx};
635 auto name_buf = rp.PopRaw<std::array<u8, 0x40>>(); 634 auto name_buf = rp.PopRaw<std::array<u8, 0x40>>();
636 auto end = std::find(name_buf.begin(), name_buf.end(), '\0'); 635 auto end = std::find(name_buf.begin(), name_buf.end(), '\0');
@@ -645,7 +644,7 @@ void IApplicationDisplayService::OpenDisplay(Kernel::HLERequestContext& ctx) {
645} 644}
646 645
647void IApplicationDisplayService::CloseDisplay(Kernel::HLERequestContext& ctx) { 646void IApplicationDisplayService::CloseDisplay(Kernel::HLERequestContext& ctx) {
648 LOG_WARNING(Service, "(STUBBED) called"); 647 LOG_WARNING(Service_VI, "(STUBBED) called");
649 IPC::RequestParser rp{ctx}; 648 IPC::RequestParser rp{ctx};
650 u64 display_id = rp.Pop<u64>(); 649 u64 display_id = rp.Pop<u64>();
651 650
@@ -654,7 +653,7 @@ void IApplicationDisplayService::CloseDisplay(Kernel::HLERequestContext& ctx) {
654} 653}
655 654
656void IApplicationDisplayService::OpenLayer(Kernel::HLERequestContext& ctx) { 655void IApplicationDisplayService::OpenLayer(Kernel::HLERequestContext& ctx) {
657 LOG_WARNING(Service, "(STUBBED) called"); 656 LOG_WARNING(Service_VI, "(STUBBED) called");
658 IPC::RequestParser rp{ctx}; 657 IPC::RequestParser rp{ctx};
659 auto name_buf = rp.PopRaw<std::array<u8, 0x40>>(); 658 auto name_buf = rp.PopRaw<std::array<u8, 0x40>>();
660 auto end = std::find(name_buf.begin(), name_buf.end(), '\0'); 659 auto end = std::find(name_buf.begin(), name_buf.end(), '\0');
@@ -704,7 +703,7 @@ void IApplicationDisplayService::CreateStrayLayer(Kernel::HLERequestContext& ctx
704} 703}
705 704
706void IApplicationDisplayService::DestroyStrayLayer(Kernel::HLERequestContext& ctx) { 705void IApplicationDisplayService::DestroyStrayLayer(Kernel::HLERequestContext& ctx) {
707 LOG_WARNING(Service, "(STUBBED) called"); 706 LOG_WARNING(Service_VI, "(STUBBED) called");
708 707
709 IPC::RequestParser rp{ctx}; 708 IPC::RequestParser rp{ctx};
710 u64 layer_id = rp.Pop<u64>(); 709 u64 layer_id = rp.Pop<u64>();
@@ -714,7 +713,7 @@ void IApplicationDisplayService::DestroyStrayLayer(Kernel::HLERequestContext& ct
714} 713}
715 714
716void IApplicationDisplayService::SetLayerScalingMode(Kernel::HLERequestContext& ctx) { 715void IApplicationDisplayService::SetLayerScalingMode(Kernel::HLERequestContext& ctx) {
717 LOG_WARNING(Service, "(STUBBED) called"); 716 LOG_WARNING(Service_VI, "(STUBBED) called");
718 IPC::RequestParser rp{ctx}; 717 IPC::RequestParser rp{ctx};
719 u32 scaling_mode = rp.Pop<u32>(); 718 u32 scaling_mode = rp.Pop<u32>();
720 u64 unknown = rp.Pop<u64>(); 719 u64 unknown = rp.Pop<u64>();
@@ -724,7 +723,7 @@ void IApplicationDisplayService::SetLayerScalingMode(Kernel::HLERequestContext&
724} 723}
725 724
726void IApplicationDisplayService::GetDisplayVsyncEvent(Kernel::HLERequestContext& ctx) { 725void IApplicationDisplayService::GetDisplayVsyncEvent(Kernel::HLERequestContext& ctx) {
727 LOG_WARNING(Service, "(STUBBED) called"); 726 LOG_WARNING(Service_VI, "(STUBBED) called");
728 IPC::RequestParser rp{ctx}; 727 IPC::RequestParser rp{ctx};
729 u64 display_id = rp.Pop<u64>(); 728 u64 display_id = rp.Pop<u64>();
730 729
diff --git a/src/core/hle/service/vi/vi_m.cpp b/src/core/hle/service/vi/vi_m.cpp
index bb440cadb..5d99647dc 100644
--- a/src/core/hle/service/vi/vi_m.cpp
+++ b/src/core/hle/service/vi/vi_m.cpp
@@ -11,7 +11,7 @@ namespace Service {
11namespace VI { 11namespace VI {
12 12
13void VI_M::GetDisplayService(Kernel::HLERequestContext& ctx) { 13void VI_M::GetDisplayService(Kernel::HLERequestContext& ctx) {
14 LOG_WARNING(Service, "(STUBBED) called"); 14 LOG_WARNING(Service_VI, "(STUBBED) called");
15 15
16 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 16 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
17 rb.Push(RESULT_SUCCESS); 17 rb.Push(RESULT_SUCCESS);
diff --git a/src/core/hle/service/vi/vi_s.cpp b/src/core/hle/service/vi/vi_s.cpp
index dc2848a9c..411757981 100644
--- a/src/core/hle/service/vi/vi_s.cpp
+++ b/src/core/hle/service/vi/vi_s.cpp
@@ -11,7 +11,7 @@ namespace Service {
11namespace VI { 11namespace VI {
12 12
13void VI_S::GetDisplayService(Kernel::HLERequestContext& ctx) { 13void VI_S::GetDisplayService(Kernel::HLERequestContext& ctx) {
14 LOG_WARNING(Service, "(STUBBED) called"); 14 LOG_WARNING(Service_VI, "(STUBBED) called");
15 15
16 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 16 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
17 rb.Push(RESULT_SUCCESS); 17 rb.Push(RESULT_SUCCESS);
diff --git a/src/core/hle/service/vi/vi_u.cpp b/src/core/hle/service/vi/vi_u.cpp
index 95c4d9fd7..f5568383b 100644
--- a/src/core/hle/service/vi/vi_u.cpp
+++ b/src/core/hle/service/vi/vi_u.cpp
@@ -11,7 +11,7 @@ namespace Service {
11namespace VI { 11namespace VI {
12 12
13void VI_U::GetDisplayService(Kernel::HLERequestContext& ctx) { 13void VI_U::GetDisplayService(Kernel::HLERequestContext& ctx) {
14 LOG_WARNING(Service, "(STUBBED) called"); 14 LOG_WARNING(Service_VI, "(STUBBED) called");
15 15
16 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 16 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
17 rb.Push(RESULT_SUCCESS); 17 rb.Push(RESULT_SUCCESS);