Diff
checker
テキスト
テキスト
画像
ドキュメント
Excel
フォルダ
Legal
Enterprise
デスクトップ
料金
ログイン
Diffchecker デスクトップのダウンロード
テキスト比較
2 つのテキスト ファイルの違いを見つける
ツール
履歴
ライブエディター
未変更行を折りたたむ
折り返しなし
レイアウト
分割
統合
比較精度
スマート
単語
文字
シンタックスハイライト
構文を選択
無視
テキスト変換
最初の差分へ移動
入力を編集
Diffchecker Desktop
Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手:あなたの差分はコンピューターから出ることはありません!
Desktopを入手
Untitled diff
作成日
11 年前
差分は期限切れになりません
クリア
エクスポート
共有
説明
91 削除
行
合計
削除
文字
合計
削除
この機能を引き続き使用するには、アップグレードしてください
Diff
checker
Pro
価格を見る
67 行
すべてコピー
108 追加
行
合計
追加
文字
合計
追加
この機能を引き続き使用するには、アップグレードしてください
Diff
checker
Pro
価格を見る
81 行
すべてコピー
コピー
コピー済み
コピー
コピー済み
> +#define EXYNOS_421
0
_UPHYPWR 0x0
>
> +#define EXYNOS_421
2
_UPHYPWR 0x0
> +
> +
コピー
コピー済み
コピー
コピー済み
> +#define EXYNOS_421
0
_UPHYPWR_
PHY0
_SUSPEND
(1 << 0)
> +#define EXYNOS_421
2
_UPHYPWR_
DEV
_SUSPEND
(1 << 0)
> +#define EXYNOS_421
0
_UPHYPWR_
PHY0
_PWR (1 << 3)
> +#define EXYNOS_421
2
_UPHYPWR_
DEV
_PWR (1 << 3)
> +#define EXYNOS_421
0
_UPHYPWR_
PHY0
_OTG_PWR
(1 << 4)
> +#define EXYNOS_421
2
_UPHYPWR_
DEV
_OTG_PWR
(1 << 4)
> +#define EXYNOS_421
0
_UPHYPWR_
PHY0
_SLEEP (1 << 5)
> +#define EXYNOS_421
2
_UPHYPWR_
DEV
_SLEEP (1 << 5)
> +#define EXYNOS_421
0
_UPHYPWR_
PHY0
( \
> +#define EXYNOS_421
2
_UPHYPWR_
DEV
( \
> + EXYNOS_421
0
_UPHYPWR_
PHY0
_SUSPEND | \
> + EXYNOS_421
2
_UPHYPWR_
DEV
_SUSPEND | \
> + EXYNOS_421
0
_UPHYPWR_
PHY0
_PWR | \
> + EXYNOS_421
2
_UPHYPWR_
DEV
_PWR | \
> + EXYNOS_421
0
_UPHYPWR_
PHY0
_OTG_PWR | \
> + EXYNOS_421
2
_UPHYPWR_
DEV
_OTG_PWR | \
> + EXYNOS_421
0
_UPHYPWR_
PHY0
_SLEEP)
> + EXYNOS_421
2
_UPHYPWR_
DEV
_SLEEP)
> +
> +
コピー
コピー済み
コピー
コピー済み
> +#define EXYNOS_421
0
_UPHYPWR_
PHY1
_SUSPEND (1 << 6)
> +#define EXYNOS_421
2
_UPHYPWR_
HOST
_SUSPEND (1 << 6)
> +#define EXYNOS_421
0
_UPHYPWR_
PHY1
_PWR (1 << 7)
> +#define EXYNOS_421
2
_UPHYPWR_
HOST
_PWR (1 << 7)
> +#define EXYNOS_421
0
_UPHYPWR_
PHY1
_SLEEP (1 << 8)
> +#define EXYNOS_421
2
_UPHYPWR_
HOST
_SLEEP (1 << 8)
> +#define EXYNOS_421
0
_UPHYPWR_
PHY1
( \
> +#define EXYNOS_421
2
_UPHYPWR_
HOST
( \
> + EXYNOS_421
0
_UPHYPWR_
PHY1
_SUSPEND | \
> + EXYNOS_421
2
_UPHYPWR_
HOST
_SUSPEND | \
> + EXYNOS_421
0
_UPHYPWR_
PHY1
_PWR | \
> + EXYNOS_421
2
_UPHYPWR_
HOST
_PWR | \
> + EXYNOS_421
0
_UPHYPWR_
PHY1
_SLEEP)
> + EXYNOS_421
2
_UPHYPWR_
HOST
_SLEEP)
> +
> +
コピー
コピー済み
コピー
コピー済み
> +#define EXYNOS_421
0
_UPHYPWR_HSCI0_SUSPEND (1 << 9)
> +#define EXYNOS_421
2
_UPHYPWR_HSCI0_SUSPEND (1 << 9)
> +#define EXYNOS_421
0
_UPHYPWR_HSCI0_
SLEEP
(1 << 10)
> +#define EXYNOS_421
2
_UPHYPWR_HSCI0_
PWR
(1 << 10)
> +#define EXYNOS_421
0
_UPHYPWR_HSCI0 ( \
> +#define EXYNOS_421
2_UPHYPWR_HSCI0_SLEEP (1 << 11)
> + EXYNOS_421
0
_UPHYPWR_HSCI0_SUSPEND | \
> +#define EXYNOS_4212
_UPHYPWR_HSCI0 ( \
> + EXYNOS_421
0
_UPHYPWR_HSCI0_SLEEP)
> + EXYNOS_421
2
_UPHYPWR_HSCI0_SUSPEND | \
> + EXYNOS_421
2_UPHYPWR_HSCI0_PWR | \
> + EXYNOS_4212
_UPHYPWR_HSCI0_SLEEP)
> +
> +
コピー
コピー済み
コピー
コピー済み
> +#define EXYNOS_421
0
_UPHYPWR_HSCI1_SUSPEND (1 <<
11
)
> +#define EXYNOS_421
2
_UPHYPWR_HSCI1_SUSPEND (1 <<
12)
> +#define EXYNOS_421
0
_UPHYPWR_HSCI1_SLEEP (1 <<
12
)
> +#define EXYNOS_4212_UPHYPWR_HSCI1_PWR (1 << 13
)
> +#define EXYNOS_421
0
_UPHYPWR_HSCI1 ( \
> +#define EXYNOS_421
2
_UPHYPWR_HSCI1_SLEEP (1 <<
14
)
> + EXYNOS_421
0
_UPHYPWR_HSCI1_SUSPEND | \
> +#define EXYNOS_421
2
_UPHYPWR_HSCI1 ( \
> + EXYNOS_421
0
_UPHYPWR_HSCI1_SLEEP)
> + EXYNOS_421
2
_UPHYPWR_HSCI1_SUSPEND | \
> + EXYNOS_421
2_UPHYPWR_HSCI1_PWR | \
> + EXYNOS_4212
_UPHYPWR_HSCI1_SLEEP)
> +
> +
> +/* PHY clock control */
> +/* PHY clock control */
コピー
コピー済み
コピー
コピー済み
> +#define EXYNOS_421
0
_UPHYCLK 0x4
> +#define EXYNOS_421
2
_UPHYCLK 0x4
> +
> +
コピー
コピー済み
コピー
コピー済み
> +#define EXYNOS_421
0
_UPHYCLK_PHYFSEL_MASK (0x
3
<< 0)
> +#define EXYNOS_421
2
_UPHYCLK_PHYFSEL_MASK (0x
7
<< 0)
> +#define EXYNOS_421
0
_UPHYCLK_PHYFSEL_
48MHZ
(0x0 << 0)
> +#define EXYNOS_421
2
_UPHYCLK_PHYFSEL_
9MHZ6
(0x0 << 0)
> +#define EXYNOS_421
0
_UPHYCLK_PHYFSEL_
24MHZ
(0x
3
<< 0)
> +#define EXYNOS_421
2
_UPHYCLK_PHYFSEL_
10MHZ
(0x
1
<< 0)
> +#define EXYNOS_421
0
_UPHYCLK_PHYFSEL_12MHZ (0x2 << 0)
> +#define EXYNOS_421
2
_UPHYCLK_PHYFSEL_12MHZ (0x2 << 0)
> +#define EXYNOS_4212_UPHYCLK_PHYFSEL_19MHZ2 (0x3 << 0)
> +#define EXYNOS_4212_UPHYCLK_PHYFSEL_20MHZ (0x4 << 0)
> +#define EXYNOS_4212_UPHYCLK_PHYFSEL_24MHZ (0x5 << 0)
> +#define EXYNOS_4212_UPHYCLK_PHYFSEL_50MHZ (0x7 << 0)
> +
> +
コピー
コピー済み
コピー
コピー済み
> +#define EXYNOS_421
0
_UPHYCLK_PHY0_ID_PULLUP (0x1 <<
2
)
> +#define EXYNOS_421
2
_UPHYCLK_PHY0_ID_PULLUP (0x1 <<
3
)
> +#define EXYNOS_421
0
_UPHYCLK_PHY0_COMMON_ON (0x1 << 4)
> +#define EXYNOS_421
2
_UPHYCLK_PHY0_COMMON_ON (0x1 << 4)
> +#define EXYNOS_421
0
_UPHYCLK_PHY1_COMMON_ON (0x1 << 7)
> +#define EXYNOS_421
2
_UPHYCLK_PHY1_COMMON_ON (0x1 << 7)
> +
> +#define EXYNOS_4212_UPHYCLK_HSIC_REFCLK_MASK (0x7f << 10)
> +#define EXYNOS_4212_UPHYCLK_HSIC_REFCLK_12MHZ (0x24 << 10)
> +#define EXYNOS_4212_UPHYCLK_HSIC_REFCLK_15MHZ (0x1c << 10)
> +#define EXYNOS_4212_UPHYCLK_HSIC_REFCLK_16MHZ (0x1a << 10)
> +#define EXYNOS_4212_UPHYCLK_HSIC_REFCLK_19MHZ2 (0x15 << 10)
> +#define EXYNOS_4212_UPHYCLK_HSIC_REFCLK_20MHZ (0x14 << 10)
> +
> +
> +/* PHY reset control */
> +/* PHY reset control */
コピー
コピー済み
コピー
コピー済み
> +#define EXYNOS_421
0
_UPHYRST 0x8
> +#define EXYNOS_421
2
_UPHYRST 0x8
> +
> +
コピー
コピー済み
コピー
コピー済み
> +#define EXYNOS_421
0
_URSTCON_
PHY0
(1 << 0)
> +#define EXYNOS_421
2
_URSTCON_
DEVICE
(1 << 0)
> +#define EXYNOS_421
0
_URSTCON_OTG_HLINK (1 << 1)
> +#define EXYNOS_421
2
_URSTCON_OTG_HLINK (1 << 1)
> +#define EXYNOS_421
0
_URSTCON_OTG_PHYLINK (1 << 2)
> +#define EXYNOS_421
2
_URSTCON_OTG_PHYLINK (1 << 2)
> +#define EXYNOS_421
0
_URSTCON_
PHY
1_ALL
(1 << 3)
> +#define EXYNOS_421
2
_URSTCON_
HOST_
PHY
(1 << 3)
> +#define EXYNOS_421
0
_URSTCON_PHY1
_P0
(1 << 4)
> +#define EXYNOS_421
2
_URSTCON_PHY1
(1 << 4)
> +#define EXYNOS_421
0
_URSTCON_
PHY1_P1P2
(1 << 5)
> +#define EXYNOS_421
2
_URSTCON_
HSIC0
(1 << 5)
> +#define EXYNOS_421
0
_URSTCON_HOST_LINK_ALL (1 <<
6
)
> +#define EXYNOS_421
2_URSTCON_HSIC1 (1 << 6)
> +#define EXYNOS_421
0
_URSTCON_HOST_LINK_P0 (1 <<
7
)
> +#define EXYNOS_4212
_URSTCON_HOST_LINK_ALL (1 <<
7
)
> +#define EXYNOS_421
0
_URSTCON_HOST_LINK_P1 (1 <<
8
)
> +#define EXYNOS_421
2
_URSTCON_HOST_LINK_P0 (1 <<
8
)
> +#define EXYNOS_421
0
_URSTCON_HOST_LINK_P2 (1 <<
9
)
> +#define EXYNOS_421
2
_URSTCON_HOST_LINK_P1 (1 <<
9
)
> +#define EXYNOS_421
2
_URSTCON_HOST_LINK_P2 (1 <<
10
)
> +
> +
> +/* Isolation, configured in the power management unit */
> +/* Isolation, configured in the power management unit */
コピー
コピー済み
コピー
コピー済み
> +#define EXYNOS_421
0
_USB_ISOL_
DEVICE_
OFFSET
0x0
> +#define EXYNOS_421
2
_USB_ISOL_
OFFSET
0x0
> +#define EXYNOS_421
0
_USB_ISOL_
DEVICE
(1 << 0)
> +#define EXYNOS_421
2
_USB_ISOL_
OTG
(1 << 0)
> +#define EXYNOS_421
0
_USB_ISOL_
HOST
_OFFSET 0x4
> +#define EXYNOS_421
2
_USB_ISOL_
HSIC0
_OFFSET 0x4
> +#define EXYNOS_421
0
_USB_ISOL_
HOST
(1 << 0)
> +#define EXYNOS_421
2
_USB_ISOL_
HSIC0
(1 << 0)
> +
> +#define EXYNOS_421
2_USB_ISOL_HSIC1_OFFSET 0x8
> +/* USBYPHY1 Floating prevention */
> +#define EXYNOS_421
2_USB_ISOL_HSIC1 (1 << 0)
> +#define EXYNOS_421
0_UPHY1CON 0x34
> +#define EXYNOS_421
0_UPHY1CON_FLOAT_PREVENTION 0x1
保存された差分
原文
ファイルを開く
> +#define EXYNOS_4210_UPHYPWR 0x0 > + > +#define EXYNOS_4210_UPHYPWR_PHY0_SUSPEND (1 << 0) > +#define EXYNOS_4210_UPHYPWR_PHY0_PWR (1 << 3) > +#define EXYNOS_4210_UPHYPWR_PHY0_OTG_PWR (1 << 4) > +#define EXYNOS_4210_UPHYPWR_PHY0_SLEEP (1 << 5) > +#define EXYNOS_4210_UPHYPWR_PHY0 ( \ > + EXYNOS_4210_UPHYPWR_PHY0_SUSPEND | \ > + EXYNOS_4210_UPHYPWR_PHY0_PWR | \ > + EXYNOS_4210_UPHYPWR_PHY0_OTG_PWR | \ > + EXYNOS_4210_UPHYPWR_PHY0_SLEEP) > + > +#define EXYNOS_4210_UPHYPWR_PHY1_SUSPEND (1 << 6) > +#define EXYNOS_4210_UPHYPWR_PHY1_PWR (1 << 7) > +#define EXYNOS_4210_UPHYPWR_PHY1_SLEEP (1 << 8) > +#define EXYNOS_4210_UPHYPWR_PHY1 ( \ > + EXYNOS_4210_UPHYPWR_PHY1_SUSPEND | \ > + EXYNOS_4210_UPHYPWR_PHY1_PWR | \ > + EXYNOS_4210_UPHYPWR_PHY1_SLEEP) > + > +#define EXYNOS_4210_UPHYPWR_HSCI0_SUSPEND (1 << 9) > +#define EXYNOS_4210_UPHYPWR_HSCI0_SLEEP (1 << 10) > +#define EXYNOS_4210_UPHYPWR_HSCI0 ( \ > + EXYNOS_4210_UPHYPWR_HSCI0_SUSPEND | \ > + EXYNOS_4210_UPHYPWR_HSCI0_SLEEP) > + > +#define EXYNOS_4210_UPHYPWR_HSCI1_SUSPEND (1 << 11) > +#define EXYNOS_4210_UPHYPWR_HSCI1_SLEEP (1 << 12) > +#define EXYNOS_4210_UPHYPWR_HSCI1 ( \ > + EXYNOS_4210_UPHYPWR_HSCI1_SUSPEND | \ > + EXYNOS_4210_UPHYPWR_HSCI1_SLEEP) > + > +/* PHY clock control */ > +#define EXYNOS_4210_UPHYCLK 0x4 > + > +#define EXYNOS_4210_UPHYCLK_PHYFSEL_MASK (0x3 << 0) > +#define EXYNOS_4210_UPHYCLK_PHYFSEL_48MHZ (0x0 << 0) > +#define EXYNOS_4210_UPHYCLK_PHYFSEL_24MHZ (0x3 << 0) > +#define EXYNOS_4210_UPHYCLK_PHYFSEL_12MHZ (0x2 << 0) > + > +#define EXYNOS_4210_UPHYCLK_PHY0_ID_PULLUP (0x1 << 2) > +#define EXYNOS_4210_UPHYCLK_PHY0_COMMON_ON (0x1 << 4) > +#define EXYNOS_4210_UPHYCLK_PHY1_COMMON_ON (0x1 << 7) > + > +/* PHY reset control */ > +#define EXYNOS_4210_UPHYRST 0x8 > + > +#define EXYNOS_4210_URSTCON_PHY0 (1 << 0) > +#define EXYNOS_4210_URSTCON_OTG_HLINK (1 << 1) > +#define EXYNOS_4210_URSTCON_OTG_PHYLINK (1 << 2) > +#define EXYNOS_4210_URSTCON_PHY1_ALL (1 << 3) > +#define EXYNOS_4210_URSTCON_PHY1_P0 (1 << 4) > +#define EXYNOS_4210_URSTCON_PHY1_P1P2 (1 << 5) > +#define EXYNOS_4210_URSTCON_HOST_LINK_ALL (1 << 6) > +#define EXYNOS_4210_URSTCON_HOST_LINK_P0 (1 << 7) > +#define EXYNOS_4210_URSTCON_HOST_LINK_P1 (1 << 8) > +#define EXYNOS_4210_URSTCON_HOST_LINK_P2 (1 << 9) > + > +/* Isolation, configured in the power management unit */ > +#define EXYNOS_4210_USB_ISOL_DEVICE_OFFSET 0x0 > +#define EXYNOS_4210_USB_ISOL_DEVICE (1 << 0) > +#define EXYNOS_4210_USB_ISOL_HOST_OFFSET 0x4 > +#define EXYNOS_4210_USB_ISOL_HOST (1 << 0) > + > +/* USBYPHY1 Floating prevention */ > +#define EXYNOS_4210_UPHY1CON 0x34 > +#define EXYNOS_4210_UPHY1CON_FLOAT_PREVENTION 0x1
変更されたテキスト
ファイルを開く
>> +#define EXYNOS_4212_UPHYPWR 0x0 > + > +#define EXYNOS_4212_UPHYPWR_DEV_SUSPEND (1 << 0) > +#define EXYNOS_4212_UPHYPWR_DEV_PWR (1 << 3) > +#define EXYNOS_4212_UPHYPWR_DEV_OTG_PWR (1 << 4) > +#define EXYNOS_4212_UPHYPWR_DEV_SLEEP (1 << 5) > +#define EXYNOS_4212_UPHYPWR_DEV ( \ > + EXYNOS_4212_UPHYPWR_DEV_SUSPEND | \ > + EXYNOS_4212_UPHYPWR_DEV_PWR | \ > + EXYNOS_4212_UPHYPWR_DEV_OTG_PWR | \ > + EXYNOS_4212_UPHYPWR_DEV_SLEEP) > + > +#define EXYNOS_4212_UPHYPWR_HOST_SUSPEND (1 << 6) > +#define EXYNOS_4212_UPHYPWR_HOST_PWR (1 << 7) > +#define EXYNOS_4212_UPHYPWR_HOST_SLEEP (1 << 8) > +#define EXYNOS_4212_UPHYPWR_HOST ( \ > + EXYNOS_4212_UPHYPWR_HOST_SUSPEND | \ > + EXYNOS_4212_UPHYPWR_HOST_PWR | \ > + EXYNOS_4212_UPHYPWR_HOST_SLEEP) > + > +#define EXYNOS_4212_UPHYPWR_HSCI0_SUSPEND (1 << 9) > +#define EXYNOS_4212_UPHYPWR_HSCI0_PWR (1 << 10) > +#define EXYNOS_4212_UPHYPWR_HSCI0_SLEEP (1 << 11) > +#define EXYNOS_4212_UPHYPWR_HSCI0 ( \ > + EXYNOS_4212_UPHYPWR_HSCI0_SUSPEND | \ > + EXYNOS_4212_UPHYPWR_HSCI0_PWR | \ > + EXYNOS_4212_UPHYPWR_HSCI0_SLEEP) > + > +#define EXYNOS_4212_UPHYPWR_HSCI1_SUSPEND (1 << 12) > +#define EXYNOS_4212_UPHYPWR_HSCI1_PWR (1 << 13) > +#define EXYNOS_4212_UPHYPWR_HSCI1_SLEEP (1 << 14) > +#define EXYNOS_4212_UPHYPWR_HSCI1 ( \ > + EXYNOS_4212_UPHYPWR_HSCI1_SUSPEND | \ > + EXYNOS_4212_UPHYPWR_HSCI1_PWR | \ > + EXYNOS_4212_UPHYPWR_HSCI1_SLEEP) > + > +/* PHY clock control */ > +#define EXYNOS_4212_UPHYCLK 0x4 > + > +#define EXYNOS_4212_UPHYCLK_PHYFSEL_MASK (0x7 << 0) > +#define EXYNOS_4212_UPHYCLK_PHYFSEL_9MHZ6 (0x0 << 0) > +#define EXYNOS_4212_UPHYCLK_PHYFSEL_10MHZ (0x1 << 0) > +#define EXYNOS_4212_UPHYCLK_PHYFSEL_12MHZ (0x2 << 0) > +#define EXYNOS_4212_UPHYCLK_PHYFSEL_19MHZ2 (0x3 << 0) > +#define EXYNOS_4212_UPHYCLK_PHYFSEL_20MHZ (0x4 << 0) > +#define EXYNOS_4212_UPHYCLK_PHYFSEL_24MHZ (0x5 << 0) > +#define EXYNOS_4212_UPHYCLK_PHYFSEL_50MHZ (0x7 << 0) > + > +#define EXYNOS_4212_UPHYCLK_PHY0_ID_PULLUP (0x1 << 3) > +#define EXYNOS_4212_UPHYCLK_PHY0_COMMON_ON (0x1 << 4) > +#define EXYNOS_4212_UPHYCLK_PHY1_COMMON_ON (0x1 << 7) > + > +#define EXYNOS_4212_UPHYCLK_HSIC_REFCLK_MASK (0x7f << 10) > +#define EXYNOS_4212_UPHYCLK_HSIC_REFCLK_12MHZ (0x24 << 10) > +#define EXYNOS_4212_UPHYCLK_HSIC_REFCLK_15MHZ (0x1c << 10) > +#define EXYNOS_4212_UPHYCLK_HSIC_REFCLK_16MHZ (0x1a << 10) > +#define EXYNOS_4212_UPHYCLK_HSIC_REFCLK_19MHZ2 (0x15 << 10) > +#define EXYNOS_4212_UPHYCLK_HSIC_REFCLK_20MHZ (0x14 << 10) > + > +/* PHY reset control */ > +#define EXYNOS_4212_UPHYRST 0x8 > + > +#define EXYNOS_4212_URSTCON_DEVICE (1 << 0) > +#define EXYNOS_4212_URSTCON_OTG_HLINK (1 << 1) > +#define EXYNOS_4212_URSTCON_OTG_PHYLINK (1 << 2) > +#define EXYNOS_4212_URSTCON_HOST_PHY (1 << 3) > +#define EXYNOS_4212_URSTCON_PHY1 (1 << 4) > +#define EXYNOS_4212_URSTCON_HSIC0 (1 << 5) > +#define EXYNOS_4212_URSTCON_HSIC1 (1 << 6) > +#define EXYNOS_4212_URSTCON_HOST_LINK_ALL (1 << 7) > +#define EXYNOS_4212_URSTCON_HOST_LINK_P0 (1 << 8) > +#define EXYNOS_4212_URSTCON_HOST_LINK_P1 (1 << 9) > +#define EXYNOS_4212_URSTCON_HOST_LINK_P2 (1 << 10) > + > +/* Isolation, configured in the power management unit */ > +#define EXYNOS_4212_USB_ISOL_OFFSET 0x0 > +#define EXYNOS_4212_USB_ISOL_OTG (1 << 0) > +#define EXYNOS_4212_USB_ISOL_HSIC0_OFFSET 0x4 > +#define EXYNOS_4212_USB_ISOL_HSIC0 (1 << 0) > +#define EXYNOS_4212_USB_ISOL_HSIC1_OFFSET 0x8 > +#define EXYNOS_4212_USB_ISOL_HSIC1 (1 << 0)
違いを見つける