Differential D37277

stand: fix usb build
AcceptedPublic
Actions

Authored by kevans on Nov 5 2022, 5:50 AM.

Tags

None

Referenced Files

	Unknown Object (File)
	Sun, Oct 12, 2:13 AM

	Unknown Object (File)
	Thu, Sep 25, 3:40 PM

	Unknown Object (File)
	Sun, Sep 14, 8:59 PM

	Unknown Object (File)
	Jul 29 2025, 2:32 AM

	Unknown Object (File)
	Jul 27 2025, 5:01 AM

	Unknown Object (File)
	Jul 5 2025, 7:34 AM

	Unknown Object (File)
	Jun 14 2025, 10:17 AM

	Unknown Object (File)
	Apr 28 2025, 3:18 PM

View All 40 Files

Subscribers

Details

Reviewers

imp
• hselasky
manu

Summary

delay()'s prototype is wrong, doesn't match bootstrap.h
umass_loader.c needs sys/disk.h for disk ioctl definitions
disk_devdesc embeds devdesc as of de04d704a98a7 ("Use the actual struct devdesc at the start [...]")
nsegs is a write-only variable, we ended up just using length directly

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 48173
Build 45060: arc lint + arc unit

Event Timeline

kevans created this revision.Nov 5 2022, 5:50 AM

Herald added a reviewer: manu. · View Herald TranscriptNov 5 2022, 5:50 AM

Herald added a subscriber: dab. · View Herald Transcript

kevans requested review of this revision.Nov 5 2022, 5:50 AM

Harbormaster completed remote builds in B48173: Diff 112647.Nov 5 2022, 5:50 AM

seems good. looks like I need to add this to universe.sh

stand/usb/storage/umass_loader.c
33	why is this needed?

This revision is now accepted and ready to land.Nov 5 2022, 3:34 PM

Thank you!

• hselasky accepted this revision.Nov 5 2022, 3:59 PM

• hselasky added inline comments.

stand/usb/storage/umass_loader.c
33	If the code compiles w/o feel free to remove it.

In D37277#846837, @imp wrote:

seems good. looks like I need to add this to universe.sh

No objections.

kevans added inline comments.Nov 5 2022, 4:17 PM

stand/usb/storage/umass_loader.c
33	Noted in the commit message; sys/disk.h is needed for disk ioctls (DIOCGMEDIASIZE/DIOCGSECTORSIZE)

Revision Contents
Changeset List

Path

Size

stand/

kshim/

2 lines

usb/

storage/

6 lines

usb_busdma_loader.c

6 lines

Diff 112647

stand/kshim/bsd_kernel.h

Loading...

stand/usb/storage/umass_loader.c

Loading...

stand/usb/usb_busdma_loader.c

Loading...