Skip to content

Commit 18bc759

Browse files
committed
ports/v: Bump revision and fix kernel warnings
1 parent 8231e56 commit 18bc759

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

kernel/modules/dev/ahci/ahci.v

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -321,14 +321,14 @@ fn (mut d AHCIDevice) rw_lba(buffer voidptr, start u64, cnt u64, rw bool) int {
321321
cmd_ptr.device = 1 << 6
322322

323323
cmd_ptr.lba0 = u8(start & 0xff)
324-
cmd_ptr.lba1 = u8(start >> 8 & 0xff)
325-
cmd_ptr.lba2 = u8(start >> 16 & 0xff)
326-
cmd_ptr.lba3 = u8(start >> 24 & 0xff)
327-
cmd_ptr.lba4 = u8(start >> 32 & 0xff)
328-
cmd_ptr.lba5 = u8(start >> 40 & 0xff)
324+
cmd_ptr.lba1 = u8((start >> 8) & 0xff)
325+
cmd_ptr.lba2 = u8((start >> 16) & 0xff)
326+
cmd_ptr.lba3 = u8((start >> 24) & 0xff)
327+
cmd_ptr.lba4 = u8((start >> 32) & 0xff)
328+
cmd_ptr.lba5 = u8((start >> 40) & 0xff)
329329

330330
cmd_ptr.countl = u8(cnt & 0xff)
331-
cmd_ptr.counth = u8(cnt >> 8 & 0xff)
331+
cmd_ptr.counth = u8((cnt >> 8) & 0xff)
332332

333333
d.send_cmd(cmd_slot)
334334

@@ -466,7 +466,7 @@ pub fn (mut c AHCIController) initialise(pci_device &pci.PCIDevice) int {
466466
c.pci_bar = pci_device.get_bar(0x5)
467467
c.regs = &AHCIRegisters(c.pci_bar.base + higher_half)
468468

469-
c.version_maj = c.regs.vs >> 16 & 0xffff
469+
c.version_maj = (c.regs.vs >> 16) & 0xffff
470470
c.version_min = c.regs.vs & 0xffff
471471

472472
print('ahci: controller detected version ${c.version_maj:x}:${c.version_min:x}\n')
@@ -482,7 +482,7 @@ pub fn (mut c AHCIController) initialise(pci_device &pci.PCIDevice) int {
482482
c.regs.ghc &= ~(1 << 1)
483483

484484
c.port_cnt = c.regs.cap & 0b11111
485-
c.cmd_slots = c.regs.cap >> 8 & 0b11111
485+
c.cmd_slots = (c.regs.cap >> 8) & 0b11111
486486

487487
for i := u64(0); i < c.port_cnt; i++ {
488488
if c.regs.pi & (1 << i) != 0 {

kernel/modules/dev/nvme/nvme.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ pub fn (mut namespace NVMENamespace) initialise(mut parent_controller NVMEContro
452452
fn calculate_max_prps(mut c NVMEController, identity &NVMENamespaceID) u64 {
453453
lba_shift := identity.lbaf_list[identity.flbas & 0xf].ds
454454

455-
shift := 12 + (c.regs.cap >> 48 & 0xf)
455+
shift := 12 + ((c.regs.cap >> 48) & 0xf)
456456
mut max_transfer_shift := u64(20)
457457

458458
if c.controller_id.mdts != 0 {
@@ -739,7 +739,7 @@ pub fn (mut c NVMEController) initialise(pci_device &pci.PCIDevice) int {
739739
}
740740

741741
c.queue_entries = c.regs.cap & 0xffff
742-
c.strides = c.regs.cap >> 32 & 0xf
742+
c.strides = (c.regs.cap >> 32) & 0xf
743743

744744
c.qid_bitmap.initialise(0xffff)
745745

recipes/v

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
name=v
2-
version=6944f61721b0336ddcac1f5f596640375eb36a29
2+
version=6cc096a4b38172bd8594280cbd09285b65daf7eb
33
revision=1
44
tarball_url="https://github.com/vlang/v/archive/${version}.tar.gz"
5-
tarball_blake2b="1c9a708d95e18baf03789f345914c0c9b61819912c564d055e00680180b2a3c5a86ff46ab2ed4378d925313b2e1e105f8e828de7189033e3d5653254231ec249"
5+
tarball_blake2b="6d9900bcc97a456245f631c4aaf92e1e9aa2ce9b9f2dac5c9af3168be9ceb14c6f77c04f6b9f4fff5a8dae5ef814aee0febf033f9c9d1c6860b7134063061ffe"
66
source_imagedeps="curl"
77
source_allow_network="yes"
88
hostdeps="gcc"
99
deps="core-libs"
1010

1111
regenerate() {
12-
curl -o v.c https://raw.githubusercontent.com/vlang/vc/b1aa385c7c0a56050fc14971e0c6a668cb1cf07a/v.c
12+
curl -o v.c https://raw.githubusercontent.com/vlang/vc/5a6fc9575441287056aa7d6ef64417e1fe6cc3c7/v.c
1313
}
1414

1515
build() {

0 commit comments

Comments
 (0)