Page MenuHomeFreeBSD
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)
Sat, Nov 22, 6:10 PM
Unknown Object (File)
Fri, Nov 21, 10:07 PM
Unknown Object (File)
Nov 16 2025, 1:56 PM
Unknown Object (File)
Nov 10 2025, 2:59 AM
Unknown Object (File)
Nov 9 2025, 5:14 AM
Unknown Object (File)
Oct 25 2025, 12:54 PM
Unknown Object (File)
Oct 25 2025, 12:48 PM
Unknown Object (File)
Oct 25 2025, 12:48 PM
View All 49 Files
Subscribers
dab

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
imp accepted this revision.Nov 5 2022, 3:34 PM

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
• hselasky added a comment.Nov 5 2022, 3:59 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.

• hselasky added a comment.Nov 5 2022, 4:01 PM
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

PathSize
stand/
kshim/
2 lines
usb/
storage/
6 lines
6 lines

Diff 112647

View Options

stand/kshim/bsd_kernel.h

Loading...
View Options

stand/usb/storage/umass_loader.c

Loading...
View Options

stand/usb/usb_busdma_loader.c

Loading...