Skip to content

Commit 27cb6bd

Browse files
authored
Update vita-headers, workflows and regenerate bindings (#9)
* Update github workflows * Regenerate bindings after bindgen update * Update vita-headers to 7b96f64c07de32b4935cb3e31eefc882c5522c01 * Update version to 0.2.0
1 parent a755188 commit 27cb6bd

File tree

225 files changed

+1508
-2140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+1508
-2140
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
key: ${{ runner.os }}-vitasdk
3737
fail-on-cache-miss: true
3838

39-
- name: Cache generator depenedencies
39+
- name: Cache dependencies
4040
uses: actions/cache@v3
4141
with:
4242
path: |
@@ -45,7 +45,7 @@ jobs:
4545
~/.cargo/registry/cache/
4646
~/.cargo/git/db/
4747
target/
48-
key: ${{ runner.os }}-cargo-example-${{ hashFiles('Cargo.lock') }}
48+
key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
4949

5050
- name: Install cargo-vita
5151
continue-on-error: true

.github/workflows/update-bindings.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ jobs:
4545
directory: ${{ runner.temp }}/llvm
4646
cached: ${{ steps.cache-llvm.outputs.cache-hit }}
4747

48-
- name: Cache generator depenedencies
48+
- name: Cache generator dependencies
4949
uses: actions/cache@v3
5050
with:
5151
path: |
5252
~/.cargo/bin/
5353
~/.cargo/registry/index/
5454
~/.cargo/registry/cache/
5555
~/.cargo/git/db/
56-
generator/target/
57-
key: ${{ runner.os }}-cargo-generator-${{ hashFiles('generator/Cargo.lock') }}
56+
target/
57+
key: ${{ runner.os }}-cargo-generator-${{ hashFiles('Cargo.lock') }}
5858

5959
- name: Update vita-headers
6060
run: |
@@ -70,8 +70,6 @@ jobs:
7070
run: |
7171
cd generator
7272
cargo run
73-
cd ..
74-
cargo fmt
7573
7674
- name: Commit and create pull request
7775
id: create-pull-request

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "vitasdk-sys"
3-
version = "0.1.1"
3+
version = "0.2.0"
44
authors = ["Aphek <bilkow@tutanota.com>"]
55
edition = "2021"
66
license = "MIT OR Apache-2.0"

generator/config.toml

+6-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ lib_rs_prelude = """\
1010
clippy::useless_transmute,
1111
clippy::too_many_arguments,
1212
clippy::len_without_is_empty,
13-
clippy::module_inception,
14-
clippy::incorrect_clone_impl_on_copy_type
13+
clippy::module_inception
1514
)]
1615
"""
1716

@@ -40,8 +39,12 @@ extra_lines = ["use crate::psp2common::kernel::iofilemgr::*;"]
4039

4140
[[lists]]
4241
files = ["psp2/paf/misc.h"]
43-
extra_lines = ["use crate::psp2::kernel::threadmgr::lw_mutex::*;"]
42+
extra_lines = ["use crate::psp2common::kernel::threadmgr::*;"]
4443

4544
[[lists]]
4645
files = ["psp2/vshbridge.h"]
4746
extra_lines = ["use crate::psp2common::kernel::modulemgr::*;"]
47+
48+
[[lists]]
49+
files = ["psp2/net/netctl.h", "psp2/netcheck_dialog.h", "psp2/pspnet_adhoc.h", "psp2/pspnet_adhocctl.h"]
50+
extra_lines = ["use crate::psp2common::net::*;"]

generator/vita-headers

Submodule vita-headers updated 48 files

src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
clippy::useless_transmute,
88
clippy::too_many_arguments,
99
clippy::len_without_is_empty,
10-
clippy::module_inception,
11-
clippy::incorrect_clone_impl_on_copy_type
10+
clippy::module_inception
1211
)]
1312
pub mod ctypes;
1413
pub mod psp2;

src/psp2/appmgr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::apputil::*;

src/psp2/apputil.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;
@@ -231,6 +231,12 @@ extern "C" {
231231
extern "C" {
232232
pub fn sceAppUtilPhotoUmount() -> crate::ctypes::c_int;
233233
}
234+
extern "C" {
235+
pub fn sceAppUtilCacheMount() -> crate::ctypes::c_int;
236+
}
237+
extern "C" {
238+
pub fn sceAppUtilCacheUmount() -> crate::ctypes::c_int;
239+
}
234240
extern "C" {
235241
pub fn sceAppUtilSystemParamGetInt(
236242
paramId: crate::ctypes::c_uint,

src/psp2/atrac.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::audiodec::*;

src/psp2/audiodec.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;
@@ -32,7 +32,7 @@ impl<T> ::core::default::Default for __BindgenUnionField<T> {
3232
impl<T> ::core::clone::Clone for __BindgenUnionField<T> {
3333
#[inline]
3434
fn clone(&self) -> Self {
35-
Self::new()
35+
*self
3636
}
3737
}
3838
impl<T> ::core::marker::Copy for __BindgenUnionField<T> {}

src/psp2/audioenc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;
@@ -32,7 +32,7 @@ impl<T> ::core::default::Default for __BindgenUnionField<T> {
3232
impl<T> ::core::clone::Clone for __BindgenUnionField<T> {
3333
#[inline]
3434
fn clone(&self) -> Self {
35-
Self::new()
35+
*self
3636
}
3737
}
3838
impl<T> ::core::marker::Copy for __BindgenUnionField<T> {}

src/psp2/audioin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
pub mod SceAudioInErrorCode {
44
pub type Type = crate::ctypes::c_uint;

src/psp2/audioout.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/avconfig.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/avplayer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/bgapputil.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
pub mod SceBgAppUtilErrorCode {
44
pub type Type = crate::ctypes::c_uint;

src/psp2/camera.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/common_dialog.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::gxm::*;

src/psp2/compat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::io::devctl::*;

src/psp2/ctrl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/deci4p/user.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/display.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/dmac5.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/fiber.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/fios2kernel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/fios2kernel02.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2common::fios2::*;

src/psp2/gps.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::rtc::*;

src/psp2/gxm.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;
@@ -134,6 +134,7 @@ pub mod SceGxmErrorCode {
134134
pub const SCE_GXM_ERROR_INVALID_TEXTURE: Type = 2153447448;
135135
pub const SCE_GXM_ERROR_INVALID_TEXTURE_DATA_POINTER: Type = 2153447449;
136136
pub const SCE_GXM_ERROR_INVALID_TEXTURE_PALETTE_POINTER: Type = 2153447450;
137+
pub const SCE_GXM_ERROR_OUT_OF_RENDER_TARGETS: Type = 2153447463;
137138
}
138139
pub type SceGxmDisplayQueueCallback =
139140
::core::option::Option<unsafe extern "C" fn(callbackData: *const crate::ctypes::c_void)>;

src/psp2/gxt.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::gxm::*;

src/psp2/hid.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/ime_dialog.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::common_dialog::*;

src/psp2/incoming_dialog.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::kernel::clib::*;

src/psp2/io/devctl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/io/dirent.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/io/fcntl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/io/stat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/jpeg.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/jpegarm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::jpeg::*;

src/psp2/jpegenc.rs

+3-24
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,14 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;
55
#[allow(unused_imports)]
6+
use crate::psp2common::jpegenc::*;
7+
#[allow(unused_imports)]
68
use crate::psp2common::types::*;
79
#[allow(unused_imports)]
810
use crate::vitasdk::build_utils::*;
911

10-
pub type SceJpegEncoderContext = *mut crate::ctypes::c_void;
11-
pub mod SceJpegEncErrorCode {
12-
pub type Type = crate::ctypes::c_uint;
13-
pub const SCE_JPEGENC_ERROR_IMAGE_SIZE: Type = 2154103296;
14-
pub const SCE_JPEGENC_ERROR_INSUFFICIENT_BUFFER: Type = 2154103297;
15-
pub const SCE_JPEGENC_ERROR_INVALID_COMPRATIO: Type = 2154103298;
16-
pub const SCE_JPEGENC_ERROR_INVALID_PIXELFORMAT: Type = 2154103299;
17-
pub const SCE_JPEGENC_ERROR_INVALID_HEADER_MODE: Type = 2154103300;
18-
pub const SCE_JPEGENC_ERROR_INVALID_POINTER: Type = 2154103301;
19-
pub const SCE_JPEGENC_ERROR_NOT_PHY_CONTINUOUS_MEMORY: Type = 2154103302;
20-
}
21-
pub mod SceJpegEncoderPixelFormat {
22-
pub type Type = crate::ctypes::c_uint;
23-
pub const SCE_JPEGENC_PIXELFORMAT_ARGB8888: Type = 0;
24-
pub const SCE_JPEGENC_PIXELFORMAT_YCBCR420: Type = 8;
25-
pub const SCE_JPEGENC_PIXELFORMAT_YCBCR422: Type = 9;
26-
pub const SCE_JPEGENC_PIXELFORMAT_CSC_ARGB_YCBCR: Type = 16;
27-
}
28-
pub mod SceJpegEncoderHeaderMode {
29-
pub type Type = crate::ctypes::c_uint;
30-
pub const SCE_JPEGENC_HEADER_MODE_JPEG: Type = 0;
31-
pub const SCE_JPEGENC_HEADER_MODE_MJPEG: Type = 1;
32-
}
3312
pub mod SceJpegEncoderInitParamOption {
3413
pub type Type = crate::ctypes::c_uint;
3514
pub const SCE_JPEGENC_INIT_PARAM_OPTION_NONE: Type = 0;

src/psp2/jpegencarm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/json.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/kernel/clib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

src/psp2/kernel/cpu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.65.1 */
1+
/* automatically generated by rust-bindgen 0.68.1 */
22

33
#[allow(unused_imports)]
44
use crate::psp2::types::*;

0 commit comments

Comments
 (0)