From 9a2c83d944abfe3b047faf4c92c27ec0f2359050 Mon Sep 17 00:00:00 2001
From: Marko Mijalkovic <marko.mijalkovic97@gmail.com>
Date: Sat, 27 Jun 2020 18:42:58 -0400
Subject: [PATCH] Declare all extern blocks as `extern "C"`
---
src/psp/atrac.rs | 2 +-
src/psp/codec.rs | 4 ++--
src/psp/hprm.rs | 2 +-
src/psp/jpeg.rs | 2 +-
src/psp/mp3.rs | 2 +-
src/psp/nand.rs | 2 +-
src/psp/openpsid.rs | 2 +-
src/psp/registry.rs | 2 +-
src/psp/sircs.rs | 2 +-
src/psp/umd.rs | 2 +-
src/psp/usb.rs | 6 +++---
src/psp/wlan.rs | 4 ++--
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/psp/atrac.rs b/src/psp/atrac.rs
index 37261292..6df7e3d2 100644
--- a/src/psp/atrac.rs
+++ b/src/psp/atrac.rs
@@ -13,7 +13,7 @@ pub struct Atrac3BufferInfo {
pub ui_read_position_second_buf: u32,
}
-extern {
+extern "C" {
pub fn sceAtracGetAtracID(ui_codec_type: u32) -> i32;
pub fn sceAtracSetDataAndGetID(
buf: *mut c_void,
diff --git a/src/psp/codec.rs b/src/psp/codec.rs
index 84a583e0..2d54f1b6 100644
--- a/src/psp/codec.rs
+++ b/src/psp/codec.rs
@@ -1,4 +1,4 @@
-extern {
+extern "C" {
pub fn sceVideocodecOpen(
buffer: *mut u32,
type_: i32,
@@ -25,7 +25,7 @@ pub enum AudioCodec {
Aac = 0x00001003,
}
-extern {
+extern "C" {
pub fn sceAudiocodecCheckNeedMem(
buffer: *mut u32,
type_: i32,
diff --git a/src/psp/hprm.rs b/src/psp/hprm.rs
index 3b9a6214..fcd8b8ae 100644
--- a/src/psp/hprm.rs
+++ b/src/psp/hprm.rs
@@ -5,7 +5,7 @@ pub const VOL_UP: i32 = 0x10;
pub const VOL_DOWN: i32 = 0x20;
pub const HOLD: i32 = 0x80;
-extern {
+extern "C" {
pub fn sceHprmPeekCurrentKey(key: *mut i32) -> i32;
pub fn sceHprmPeekLatch(latch: *mut [u32;4]) -> i32;
pub fn sceHprmReadLatch(latch: *mut [u32;4]) -> i32;
diff --git a/src/psp/jpeg.rs b/src/psp/jpeg.rs
index b5357f6b..a3ed6fe0 100644
--- a/src/psp/jpeg.rs
+++ b/src/psp/jpeg.rs
@@ -1,5 +1,5 @@
use super::c_void;
-extern {
+extern "C" {
pub fn sceJpegInitMJpeg() -> i32;
pub fn sceJpegFinishMJpeg() -> i32;
pub fn sceJpegCreateMJpeg(width: i32, height: i32) -> i32;
diff --git a/src/psp/mp3.rs b/src/psp/mp3.rs
index 081a6a43..25d4787f 100644
--- a/src/psp/mp3.rs
+++ b/src/psp/mp3.rs
@@ -17,7 +17,7 @@ pub struct SceMp3InitArg {
#[repr(transparent)]
pub struct Handle(pub i32);
-extern {
+extern "C" {
pub fn sceMp3ReserveMp3Handle(args: *mut SceMp3InitArg) -> i32;
pub fn sceMp3ReleaseMp3Handle(handle: Handle) -> i32;
pub fn sceMp3InitResource() -> i32;
diff --git a/src/psp/nand.rs b/src/psp/nand.rs
index e52ee0af..53acd946 100644
--- a/src/psp/nand.rs
+++ b/src/psp/nand.rs
@@ -1,5 +1,5 @@
use super::c_void;
-extern {
+extern "C" {
pub fn sceNandSetWriteProtect(protect_flag: i32) -> i32;
pub fn sceNandLock(write_flag: i32) -> i32;
pub fn sceNandUnlock();
diff --git a/src/psp/openpsid.rs b/src/psp/openpsid.rs
index 7a348511..21b6e91e 100644
--- a/src/psp/openpsid.rs
+++ b/src/psp/openpsid.rs
@@ -4,6 +4,6 @@ pub struct OpenPSID {
pub data: [u8; 16usize],
}
-extern {
+extern "C" {
pub fn sceOpenPSIDGetOpenPSID(openpsid: *mut OpenPSID) -> i32;
}
diff --git a/src/psp/registry.rs b/src/psp/registry.rs
index 7d0297b1..49c1ed24 100644
--- a/src/psp/registry.rs
+++ b/src/psp/registry.rs
@@ -26,7 +26,7 @@ pub enum KeyType {
Bytes = 4,
}
-extern {
+extern "C" {
pub fn sceRegOpenRegistry(
reg: *mut Key,
mode: i32,
diff --git a/src/psp/sircs.rs b/src/psp/sircs.rs
index b6f2b5c7..8dd97004 100644
--- a/src/psp/sircs.rs
+++ b/src/psp/sircs.rs
@@ -6,6 +6,6 @@ pub struct SircsData {
pub dev: u16,
}
-extern {
+extern "C" {
pub fn sceSircsSend(sd: *mut SircsData, count: i32) -> i32;
}
diff --git a/src/psp/umd.rs b/src/psp/umd.rs
index 5d23ec76..1fe24a2e 100644
--- a/src/psp/umd.rs
+++ b/src/psp/umd.rs
@@ -22,7 +22,7 @@ pub const UMD_INITING: i32 = 0x08;
pub const UMD_INITED: i32 = 0x10;
pub const UMD_READY: i32 = 0x20;
-extern {
+extern "C" {
pub fn sceUmdCheckMedium() -> i32;
pub fn sceUmdGetDiscInfo(info: *mut UmdInfo) -> i32;
pub fn sceUmdActivate(unit: i32, drive: *const u8) -> i32;
diff --git a/src/psp/usb.rs b/src/psp/usb.rs
index 85ddbd95..9632a04e 100644
--- a/src/psp/usb.rs
+++ b/src/psp/usb.rs
@@ -14,7 +14,7 @@ pub const ESTABLISHED: i32 = 0x002;
pub const USB_CAM_FLIP: i32 = 1;
pub const USB_CAM_MIRROR: i32 = 0x100;
-extern {
+extern "C" {
pub fn sceUsbStart(
driver_name: *const u8,
size: i32,
@@ -196,7 +196,7 @@ pub enum UsbCamEvLevel {
Neg2_0,
}
-extern {
+extern "C" {
pub fn sceUsbCamSetupStill(param: *mut UsbCamSetupStillParam) -> i32;
pub fn sceUsbCamSetupStillEx(param: *mut UsbCamSetupStillExParam) -> i32;
pub fn sceUsbCamStillInputBlocking(buf: *mut u8, size: usize) -> i32;
@@ -247,7 +247,7 @@ extern {
pub fn sceUsbCamGetLensDirection() -> i32;
}
-extern {
+extern "C" {
pub fn sceUsbstorBootRegisterNotify(event_flag: SceUid) -> i32;
pub fn sceUsbstorBootUnregisterNotify(event_flag: u32) -> i32;
pub fn sceUsbstorBootSetCapacity(size: u32) -> i32;
diff --git a/src/psp/wlan.rs b/src/psp/wlan.rs
index 5ec19d04..2fa7d283 100644
--- a/src/psp/wlan.rs
+++ b/src/psp/wlan.rs
@@ -1,10 +1,10 @@
-extern {
+extern "C" {
pub fn sceWlanDevIsPowerOn() -> i32;
pub fn sceWlanGetSwitchState() -> i32;
pub fn sceWlanGetEtherAddr(ether_addr: *mut u8) -> i32;
}
-extern {
+extern "C" {
pub fn sceWlanDevAttach() -> i32;
pub fn sceWlanDevDetach() -> i32;
}
--
GitLab